From 5e82a1917240c8c618819d2224cd7d41d6eabe95 Mon Sep 17 00:00:00 2001 From: Mike Dame Date: Wed, 5 Feb 2025 10:46:12 -0500 Subject: [PATCH 01/30] Add LICENSE file to distros/ (#2393) --- distros/LICENSE | 201 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 201 insertions(+) create mode 100644 distros/LICENSE diff --git a/distros/LICENSE b/distros/LICENSE new file mode 100644 index 0000000000..d164b5f728 --- /dev/null +++ b/distros/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2023 Odigos + + 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. From c7e6861e38085cfa96bc1941e4223eff9873bf05 Mon Sep 17 00:00:00 2001 From: Mike Dame Date: Wed, 5 Feb 2025 12:19:59 -0500 Subject: [PATCH 02/30] Bump OpenTelemetry Collector dependencies to 0.119.0 (#2386) Co-authored-by: Amir Blum --- Makefile | 4 +- api/go.mod | 2 +- api/go.sum | 4 +- autoscaler/go.mod | 6 +- autoscaler/go.sum | 12 +- cli/go.mod | 2 +- cli/go.sum | 4 +- collector/Makefile | 2 +- collector/builder-config.yaml | 182 +-- .../exporters/azureblobstorageexporter/go.mod | 48 +- .../exporters/azureblobstorageexporter/go.sum | 104 +- .../googlecloudstorageexporter/go.mod | 46 +- .../googlecloudstorageexporter/go.sum | 100 +- .../exporters/mockdestinationexporter/go.mod | 48 +- .../exporters/mockdestinationexporter/go.sum | 104 +- collector/internal/tools/go.mod | 21 +- collector/internal/tools/go.sum | 40 +- collector/odigosotelcol/components.go | 174 +-- collector/odigosotelcol/go.mod | 504 ++++---- collector/odigosotelcol/go.sum | 1044 +++++++++-------- collector/odigosotelcol/main.go | 5 +- .../generated_component_test.go | 2 +- .../odigosconditionalattributes/go.mod | 34 +- .../odigosconditionalattributes/go.sum | 68 +- .../generated_component_test.go | 2 +- .../odigosresourcenameprocessor/go.mod | 38 +- .../odigosresourcenameprocessor/go.sum | 76 +- .../generated_component_test.go | 2 +- .../processors/odigossamplingprocessor/go.mod | 36 +- .../processors/odigossamplingprocessor/go.sum | 72 +- .../generated_component_test.go | 2 +- .../odigossourcesfilterprocessor/go.mod | 34 +- .../odigossourcesfilterprocessor/go.sum | 68 +- .../generated_component_test.go | 2 +- .../odigossqldboperationprocessor/go.mod | 38 +- .../odigossqldboperationprocessor/go.sum | 80 +- .../generated_component_test.go | 2 +- .../processors/odigostrafficmetrics/go.mod | 42 +- .../processors/odigostrafficmetrics/go.sum | 80 +- .../internal/metadata/generated_telemetry.go | 33 +- .../metadatatest/generated_telemetrytest.go | 148 ++- .../generated_telemetrytest_test.go | 25 +- collector/providers/odigosfileprovider/go.mod | 2 +- collector/providers/odigosfileprovider/go.sum | 4 +- frontend/go.mod | 84 +- frontend/go.sum | 180 +-- instrumentor/go.mod | 6 +- instrumentor/go.sum | 12 +- k8sutils/go.mod | 4 +- k8sutils/go.sum | 8 +- odiglet/go.mod | 5 +- odiglet/go.sum | 10 +- opampserver/go.mod | 4 +- opampserver/go.sum | 8 +- scheduler/go.mod | 6 +- scheduler/go.sum | 12 +- scripts/cli-docgen/go.mod | 2 +- scripts/cli-docgen/go.sum | 4 +- 58 files changed, 1898 insertions(+), 1793 deletions(-) diff --git a/Makefile b/Makefile index 51134f7210..f15a7ad590 100644 --- a/Makefile +++ b/Makefile @@ -228,8 +228,8 @@ update-dep/%: cd $(DIR) && go get $(MODULE)@$(VERSION) GO_AUTO_VERSION=v0.19.0-alpha -UNSTABLE_COLLECTOR_VERSION=v0.118.0 -STABLE_COLLECTOR_VERSION=v1.24.0 +UNSTABLE_COLLECTOR_VERSION=v0.119.0 +STABLE_COLLECTOR_VERSION=v1.25.0 STABLE_OTEL_GO_VERSION=v1.34.0 UNSTABLE_OTEL_GO_VERSION=v0.59.0 diff --git a/api/go.mod b/api/go.mod index 75d29a6bac..355db30854 100644 --- a/api/go.mod +++ b/api/go.mod @@ -59,7 +59,7 @@ require ( golang.org/x/time v0.7.0 // indirect golang.org/x/tools v0.28.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect - google.golang.org/protobuf v1.36.3 // indirect + google.golang.org/protobuf v1.36.4 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/apiextensions-apiserver v0.32.0 diff --git a/api/go.sum b/api/go.sum index be54618468..ec0608115b 100644 --- a/api/go.sum +++ b/api/go.sum @@ -162,8 +162,8 @@ 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= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= -google.golang.org/protobuf v1.36.3 h1:82DV7MYdb8anAVi3qge1wSnMDrnKK7ebr+I0hHRN1BU= -google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/protobuf v1.36.4 h1:6A3ZDJHn/eNqc1i+IdefRzy/9PokBTPvcqMySR7NNIM= +google.golang.org/protobuf v1.36.4/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/autoscaler/go.mod b/autoscaler/go.mod index 5c184a6d8f..3185ff31b0 100644 --- a/autoscaler/go.mod +++ b/autoscaler/go.mod @@ -58,7 +58,7 @@ require ( github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/prometheus/client_golang v1.20.5 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.61.0 // indirect + github.com/prometheus/common v0.62.0 // indirect github.com/prometheus/procfs v0.15.1 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/x448/float16 v0.8.4 // indirect @@ -80,8 +80,8 @@ require ( gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect - google.golang.org/grpc v1.69.4 // indirect - google.golang.org/protobuf v1.36.3 // indirect + google.golang.org/grpc v1.70.0 // indirect + google.golang.org/protobuf v1.36.4 // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/autoscaler/go.sum b/autoscaler/go.sum index da430584e1..22e8b28650 100644 --- a/autoscaler/go.sum +++ b/autoscaler/go.sum @@ -114,8 +114,8 @@ github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+ github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.61.0 h1:3gv/GThfX0cV2lpO7gkTUwZru38mxevy90Bj8YFSRQQ= -github.com/prometheus/common v0.61.0/go.mod h1:zr29OCN/2BsJRaFwG8QOBr41D6kkchKbpeNH7pAjb/s= +github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io= +github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I= github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII= @@ -205,10 +205,10 @@ google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f h1: google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f/go.mod h1:Ic02D47M+zbarjYYUlK57y316f2MoN0gjAwI3f2S95o= google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f h1:OxYkA3wjPsZyBylwymxSHa7ViiW1Sml4ToBrncvFehI= google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f/go.mod h1:+2Yz8+CLJbIfL9z73EW45avw8Lmge3xVElCP9zEKi50= -google.golang.org/grpc v1.69.4 h1:MF5TftSMkd8GLw/m0KM6V8CMOCY6NZ1NQDPGFgbTt4A= -google.golang.org/grpc v1.69.4/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4= -google.golang.org/protobuf v1.36.3 h1:82DV7MYdb8anAVi3qge1wSnMDrnKK7ebr+I0hHRN1BU= -google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/grpc v1.70.0 h1:pWFv03aZoHzlRKHWicjsZytKAiYCtNS0dHbXnIdq7jQ= +google.golang.org/grpc v1.70.0/go.mod h1:ofIJqVKDXx/JiXrwr2IG4/zwdH9txy3IlF40RmcJSQw= +google.golang.org/protobuf v1.36.4 h1:6A3ZDJHn/eNqc1i+IdefRzy/9PokBTPvcqMySR7NNIM= +google.golang.org/protobuf v1.36.4/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/cli/go.mod b/cli/go.mod index 56890c168e..22dee928ca 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -64,7 +64,7 @@ require ( golang.org/x/term v0.28.0 // indirect golang.org/x/text v0.21.0 // indirect golang.org/x/time v0.7.0 // indirect - google.golang.org/protobuf v1.36.3 // indirect + google.golang.org/protobuf v1.36.4 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/klog/v2 v2.130.1 // indirect diff --git a/cli/go.sum b/cli/go.sum index 25c57475ef..5ee6cb9108 100644 --- a/cli/go.sum +++ b/cli/go.sum @@ -164,8 +164,8 @@ 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= golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU= golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90= -google.golang.org/protobuf v1.36.3 h1:82DV7MYdb8anAVi3qge1wSnMDrnKK7ebr+I0hHRN1BU= -google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/protobuf v1.36.4 h1:6A3ZDJHn/eNqc1i+IdefRzy/9PokBTPvcqMySR7NNIM= +google.golang.org/protobuf v1.36.4/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/collector/Makefile b/collector/Makefile index 49c4ece352..d3008b0602 100644 --- a/collector/Makefile +++ b/collector/Makefile @@ -4,7 +4,7 @@ SRC_ROOT := $(shell git rev-parse --show-toplevel)/collector TOOLS_BIN_DIR := $(SRC_ROOT)/.tools # Define the tool version -BUILDER_VERSION = 0.118.0 +BUILDER_VERSION = 0.119.0 BUILDER := $(TOOLS_BIN_DIR)/builder_$(BUILDER_VERSION) # Determine the current operating system and architecture diff --git a/collector/builder-config.yaml b/collector/builder-config.yaml index 826895e9b9..e33495f90c 100644 --- a/collector/builder-config.yaml +++ b/collector/builder-config.yaml @@ -2,113 +2,113 @@ dist: module: odigos.io/opentelemetry-collector/cmd/odigosotelcol name: odigosotelcol description: OpenTelemetry Collector for Odigos - version: 0.118.0 + version: 0.119.0 output_path: ./odigosotelcol extensions: - - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.118.0 + - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.119.0 exporters: - - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.118.0 - - gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.118.0 - - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.118.0 - - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/odigos/exporter/azureblobstorageexporter v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/odigos/exporter/googlecloudstorageexporter v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/odigos/exporter/mockdestinationexporter v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awss3exporter v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azuredataexplorerexporter v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azuremonitorexporter v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/clickhouseexporter v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/cassandraexporter v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/coralogixexporter v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datasetexporter v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudexporter v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudpubsubexporter v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlemanagedprometheusexporter v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/honeycombmarkerexporter v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/logicmonitorexporter v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/logzioexporter v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/lokiexporter v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/mezmoexporter v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opencensusexporter v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opensearchexporter v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/pulsarexporter v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sentryexporter v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sumologicexporter v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/syslogexporter v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/tencentcloudlogserviceexporter v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.118.0 + - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.119.0 + - gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.119.0 + - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.119.0 + - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/odigos/exporter/azureblobstorageexporter v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/odigos/exporter/googlecloudstorageexporter v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/odigos/exporter/mockdestinationexporter v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awss3exporter v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azuredataexplorerexporter v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azuremonitorexporter v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/clickhouseexporter v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/cassandraexporter v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/coralogixexporter v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datasetexporter v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudexporter v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudpubsubexporter v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlemanagedprometheusexporter v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/honeycombmarkerexporter v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/logicmonitorexporter v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/logzioexporter v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/lokiexporter v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/mezmoexporter v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opencensusexporter v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opensearchexporter v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/pulsarexporter v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sentryexporter v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sumologicexporter v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/syslogexporter v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/tencentcloudlogserviceexporter v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.119.0 processors: - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/odigos/processor/odigosresourcenameprocessor v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/odigos/processor/odigossamplingprocessor v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/odigos/processor/odigosconditionalattributes v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/odigos/processor/odigossqldboperationprocessor v0.118.0 - - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.118.0 - - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatorateprocessor v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricsgenerationprocessor v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/redactionprocessor v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/sumologicprocessor v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/remotetapprocessor v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/odigos/processor/odigostrafficmetrics v0.118.0 - - gomod: github.com/odigos-io/odigos/processor/odigossourcesfilterprocessor v0.118.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/odigos/processor/odigosresourcenameprocessor v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/odigos/processor/odigossamplingprocessor v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/odigos/processor/odigosconditionalattributes v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/odigos/processor/odigossqldboperationprocessor v0.119.0 + - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.119.0 + - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatorateprocessor v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricsgenerationprocessor v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/redactionprocessor v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/sumologicprocessor v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/remotetapprocessor v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/odigos/processor/odigostrafficmetrics v0.119.0 + - gomod: github.com/odigos-io/odigos/processor/odigossourcesfilterprocessor v0.119.0 receivers: - - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.118.0 + - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.119.0 # https://github.com/open-telemetry/opentelemetry-collector/issues/8127 excludes: - github.com/knadh/koanf v1.5.0 connectors: - - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.118.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.118.0 + - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.119.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.119.0 providers: - - gomod: go.opentelemetry.io/collector/odigos/providers/odigosfileprovider v0.118.0 # fork default file provider for config reloading - - gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v0.118.0 + - gomod: go.opentelemetry.io/collector/odigos/providers/odigosfileprovider v0.119.0 # fork default file provider for config reloading + - gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v0.119.0 replaces: - github.com/open-telemetry/opentelemetry-collector-contrib/odigos/processor/odigosresourcenameprocessor => ../processors/odigosresourcenameprocessor @@ -120,4 +120,4 @@ replaces: - github.com/open-telemetry/opentelemetry-collector-contrib/odigos/exporter/mockdestinationexporter => ../exporters/mockdestinationexporter - github.com/open-telemetry/opentelemetry-collector-contrib/odigos/processor/odigostrafficmetrics => ../processors/odigostrafficmetrics - github.com/odigos-io/odigos/processor/odigossourcesfilterprocessor => ../processors/odigossourcesfilterprocessor - - go.opentelemetry.io/collector/odigos/providers/odigosfileprovider => ../providers/odigosfileprovider \ No newline at end of file + - go.opentelemetry.io/collector/odigos/providers/odigosfileprovider => ../providers/odigosfileprovider diff --git a/collector/exporters/azureblobstorageexporter/go.mod b/collector/exporters/azureblobstorageexporter/go.mod index 93bdc7d7b4..e33c3077b0 100644 --- a/collector/exporters/azureblobstorageexporter/go.mod +++ b/collector/exporters/azureblobstorageexporter/go.mod @@ -6,13 +6,13 @@ require ( github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0 github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.4.0 github.com/stretchr/testify v1.10.0 - go.opentelemetry.io/collector/component v0.118.0 - go.opentelemetry.io/collector/component/componenttest v0.118.0 - go.opentelemetry.io/collector/confmap v1.24.0 - go.opentelemetry.io/collector/consumer v1.24.0 - go.opentelemetry.io/collector/exporter v0.118.0 - go.opentelemetry.io/collector/exporter/exportertest v0.118.0 - go.opentelemetry.io/collector/pdata v1.24.0 + go.opentelemetry.io/collector/component v0.119.0 + go.opentelemetry.io/collector/component/componenttest v0.119.0 + go.opentelemetry.io/collector/confmap v1.25.0 + go.opentelemetry.io/collector/consumer v1.25.0 + go.opentelemetry.io/collector/exporter v0.119.0 + go.opentelemetry.io/collector/exporter/exportertest v0.119.0 + go.opentelemetry.io/collector/pdata v1.25.0 go.opentelemetry.io/otel/metric v1.34.0 go.opentelemetry.io/otel/trace v1.34.0 go.uber.org/goleak v1.3.0 @@ -43,20 +43,20 @@ require ( github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect go.opentelemetry.io/auto/sdk v1.1.0 // indirect - go.opentelemetry.io/collector/config/configretry v1.24.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.118.0 // indirect - go.opentelemetry.io/collector/consumer/consumererror v0.118.0 // indirect - go.opentelemetry.io/collector/consumer/consumertest v0.118.0 // indirect - go.opentelemetry.io/collector/consumer/xconsumer v0.118.0 // indirect - go.opentelemetry.io/collector/exporter/xexporter v0.118.0 // indirect - go.opentelemetry.io/collector/extension v0.118.0 // indirect - go.opentelemetry.io/collector/extension/xextension v0.118.0 // indirect - go.opentelemetry.io/collector/featuregate v1.24.0 // indirect - go.opentelemetry.io/collector/pdata/pprofile v0.118.0 // indirect - go.opentelemetry.io/collector/pipeline v0.118.0 // indirect - go.opentelemetry.io/collector/receiver v0.118.0 // indirect - go.opentelemetry.io/collector/receiver/receivertest v0.118.0 // indirect - go.opentelemetry.io/collector/receiver/xreceiver v0.118.0 // indirect + go.opentelemetry.io/collector/config/configretry v1.25.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.119.0 // indirect + go.opentelemetry.io/collector/consumer/consumererror v0.119.0 // indirect + go.opentelemetry.io/collector/consumer/consumertest v0.119.0 // indirect + go.opentelemetry.io/collector/consumer/xconsumer v0.119.0 // indirect + go.opentelemetry.io/collector/exporter/xexporter v0.119.0 // indirect + go.opentelemetry.io/collector/extension v0.119.0 // indirect + go.opentelemetry.io/collector/extension/xextension v0.119.0 // indirect + go.opentelemetry.io/collector/featuregate v1.25.0 // indirect + go.opentelemetry.io/collector/pdata/pprofile v0.119.0 // indirect + go.opentelemetry.io/collector/pipeline v0.119.0 // indirect + 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/otel v1.34.0 // indirect go.opentelemetry.io/otel/sdk v1.34.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.34.0 // indirect @@ -65,8 +65,8 @@ require ( golang.org/x/net v0.34.0 // indirect golang.org/x/sys v0.29.0 // indirect golang.org/x/text v0.21.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect - google.golang.org/grpc v1.69.4 // indirect - google.golang.org/protobuf v1.36.3 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20250124145028-65684f501c47 // indirect + google.golang.org/grpc v1.70.0 // indirect + google.golang.org/protobuf v1.36.4 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/collector/exporters/azureblobstorageexporter/go.sum b/collector/exporters/azureblobstorageexporter/go.sum index 46e3e7a570..c7de17293d 100644 --- a/collector/exporters/azureblobstorageexporter/go.sum +++ b/collector/exporters/azureblobstorageexporter/go.sum @@ -281,52 +281,52 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/collector/component v0.118.0 h1:sSO/ObxJ+yH77Z4DmT1mlSuxhbgUmY1ztt7xCA1F/8w= -go.opentelemetry.io/collector/component v0.118.0/go.mod h1:LUJ3AL2b+tmFr3hZol3hzKzCMvNdqNq0M5CF3SWdv4M= -go.opentelemetry.io/collector/component/componenttest v0.118.0 h1:knEHckoiL2fEWSIc0iehg39zP4IXzi9sHa45O+oxKo8= -go.opentelemetry.io/collector/component/componenttest v0.118.0/go.mod h1:aHc7t7zVwCpbhrWIWY+GMuaMxMCUP8C8P7pJOt8r/vU= -go.opentelemetry.io/collector/config/configretry v1.24.0 h1:sIPHhNNY2YlHMIJ//63iMxIqlgDeGczId0uUb1njsPM= -go.opentelemetry.io/collector/config/configretry v1.24.0/go.mod h1:cleBc9I0DIWpTiiHfu9v83FUaCTqcPXmebpLxjEIqro= -go.opentelemetry.io/collector/config/configtelemetry v0.118.0 h1:UlN46EViG2X42odWtXgWaqY7Y01ZKpsnswSwXTWx5mM= -go.opentelemetry.io/collector/config/configtelemetry v0.118.0/go.mod h1:SlBEwQg0qly75rXZ6W1Ig8jN25KBVBkFIIAUI1GiAAE= -go.opentelemetry.io/collector/confmap v1.24.0 h1:UUHVhkDCsVw14jPOarug9PDQE2vaB2ELPWMr7ARFBCA= -go.opentelemetry.io/collector/confmap v1.24.0/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= -go.opentelemetry.io/collector/consumer v1.24.0 h1:7DeyBm9qdr1EPuCfPjWyChPK16DbVc0wZeSa9LZprFU= -go.opentelemetry.io/collector/consumer v1.24.0/go.mod h1:0G6jvZprIp4dpKMD1ZxCjriiP9GdFvFMObsQEtTk71s= -go.opentelemetry.io/collector/consumer/consumererror v0.118.0 h1:Cx//ZFDa6wUEoRDRYRZ/Rkb52dWNoHj2e9FdlcM9jCA= -go.opentelemetry.io/collector/consumer/consumererror v0.118.0/go.mod h1:2mhnzzLYR5zS2Zz4h9ZnRM8Uogu9qatcfQwGNenhing= -go.opentelemetry.io/collector/consumer/consumertest v0.118.0 h1:8AAS9ejQapP1zqt0+cI6u+AUBheT3X0171N9WtXWsVY= -go.opentelemetry.io/collector/consumer/consumertest v0.118.0/go.mod h1:spRM2wyGr4QZzqMHlLmZnqRCxqXN4Wd0piogC4Qb5PQ= -go.opentelemetry.io/collector/consumer/xconsumer v0.118.0 h1:guWnzzRqgCInjnYlOQ1BPrimppNGIVvnknAjlIbWXuY= -go.opentelemetry.io/collector/consumer/xconsumer v0.118.0/go.mod h1:C5V2d6Ys/Fi6k3tzjBmbdZ9v3J/rZSAMlhx4KVcMIIg= -go.opentelemetry.io/collector/exporter v0.118.0 h1:PE0vF2U+znOB8OVLPWNw40bGCoT/5QquQ8Xbz4i9Rb0= -go.opentelemetry.io/collector/exporter v0.118.0/go.mod h1:5ST3gxT/RzE/vg2bcGDtWJxlQF1ypwk50UpmdK1kUqY= -go.opentelemetry.io/collector/exporter/exportertest v0.118.0 h1:8gWky42BcJsxoaqWbnqCDUjP3Y84hjC6RD/UWHwR7sI= -go.opentelemetry.io/collector/exporter/exportertest v0.118.0/go.mod h1:UbpQBZvznA8YPqqcKlafVIhB6Qa4fPf2+I67MUGyNqo= -go.opentelemetry.io/collector/exporter/xexporter v0.118.0 h1:PZAo1CFhZHfQwtzUNj+Fwcv/21pWHJHTsrIddD096fw= -go.opentelemetry.io/collector/exporter/xexporter v0.118.0/go.mod h1:x4J+qyrRcp4DfWKqK3DLZomFTIUhedsqCQWqq6Gqps4= -go.opentelemetry.io/collector/extension v0.118.0 h1:9o5jLCTRvs0+rtFDx04zTBuB4WFrE0RvtVCPovYV0sA= -go.opentelemetry.io/collector/extension v0.118.0/go.mod h1:BFwB0WOlse6JnrStO44+k9kwUVjjtseFEHhJLHD7lBg= -go.opentelemetry.io/collector/extension/extensiontest v0.118.0 h1:rKBUaFS9elGfENG45wANmrwx7mHsmt1+YWCzxjftElg= -go.opentelemetry.io/collector/extension/extensiontest v0.118.0/go.mod h1:CqNXzkIOR32D8EUpptpOXhpFkibs3kFlRyNMEgIW8l4= -go.opentelemetry.io/collector/extension/xextension v0.118.0 h1:P6gvJzqnH9ma2QfnWde/E6Xu9bAzuefzIwm5iupiVPE= -go.opentelemetry.io/collector/extension/xextension v0.118.0/go.mod h1:ne4Q8ZtRlbC0Etr2hTcVkjOpVM2bE2xy1u+R80LUkDw= -go.opentelemetry.io/collector/featuregate v1.24.0 h1:DEqDsuJgxjZ3E5JNC9hXCd4sWGFiF7h9kaziODuqwFY= -go.opentelemetry.io/collector/featuregate v1.24.0/go.mod h1:3GaXqflNDVwWndNGBJ1+XJFy3Fv/XrFgjMN60N3z7yg= -go.opentelemetry.io/collector/pdata v1.24.0 h1:D6j92eAzmAbQgivNBUnt8r9juOl8ugb+ihYynoFZIEg= -go.opentelemetry.io/collector/pdata v1.24.0/go.mod h1:cf3/W9E/uIvPS4MR26SnMFJhraUCattzzM6qusuONuc= -go.opentelemetry.io/collector/pdata/pprofile v0.118.0 h1:VK/fr65VFOwEhsSGRPj5c3lCv0yIK1Kt0sZxv9WZBb8= -go.opentelemetry.io/collector/pdata/pprofile v0.118.0/go.mod h1:eJyP/vBm179EghV3dPSnamGAWQwLyd+4z/3yG54YFoQ= -go.opentelemetry.io/collector/pdata/testdata v0.118.0 h1:5N0w1SX9KIRkwvtkrpzQgXy9eGk3vfNG0ds6mhEPMIM= -go.opentelemetry.io/collector/pdata/testdata v0.118.0/go.mod h1:UY+GHV5bOC1BnFburOZ0wiHReJj1XbW12mi2Ogbc5Lw= -go.opentelemetry.io/collector/pipeline v0.118.0 h1:RI1DMe7L0+5hGkx0EDGxG00TaJoh96MEQppgOlGx1Oc= -go.opentelemetry.io/collector/pipeline v0.118.0/go.mod h1:qE3DmoB05AW0C3lmPvdxZqd/H4po84NPzd5MrqgtL74= -go.opentelemetry.io/collector/receiver v0.118.0 h1:X4mspHmbbtwdCQZ7o370kNmdWfxRnK1FrsvEShCCKEc= -go.opentelemetry.io/collector/receiver v0.118.0/go.mod h1:wFyfu6sgrkDPLQoGOGMuChGZzkZnYcI/tPJWV4CRTzs= -go.opentelemetry.io/collector/receiver/receivertest v0.118.0 h1:XlMr2mPsyXJsMUOqCpEoY3uCPsLZQbNA5fmVNDGB7Bw= -go.opentelemetry.io/collector/receiver/receivertest v0.118.0/go.mod h1:dtu/H1RNjhy11hTVf/XUfc02uGufMhYYdhhYBbglcUg= -go.opentelemetry.io/collector/receiver/xreceiver v0.118.0 h1:dzECve9e0H3ot0JWnWPuQr9Y84RhOYSd0+CjvJskx7Y= -go.opentelemetry.io/collector/receiver/xreceiver v0.118.0/go.mod h1:Lv1nD/mSYSP64iV8k+C+mWWZZOMLRubv9d1SUory3/E= +go.opentelemetry.io/collector/component v0.119.0 h1:ZVp9myF1Bc4BLa1V4C15Jy/VpqKPPhvbxpe9pP1mPMc= +go.opentelemetry.io/collector/component v0.119.0/go.mod h1:wtuWxFl+Ky9E/5+t2FwHoLyADDiBFFDdx8fN3fEs0n8= +go.opentelemetry.io/collector/component/componenttest v0.119.0 h1:nVlBmKSu56zO/qCcNgDYCQsRoWAL+NPkrkIPAbapdQM= +go.opentelemetry.io/collector/component/componenttest v0.119.0/go.mod h1:H6KVzLkNhB/deEijLcq91Kjgs9Oshx2ZsFAwaMcuTLs= +go.opentelemetry.io/collector/config/configretry v1.25.0 h1:PelzRkTJ9zGxwdJha7pPtvR91GrgL/OzkY/MwyXYRUE= +go.opentelemetry.io/collector/config/configretry v1.25.0/go.mod h1:cleBc9I0DIWpTiiHfu9v83FUaCTqcPXmebpLxjEIqro= +go.opentelemetry.io/collector/config/configtelemetry v0.119.0 h1:gAgMUEVXZKgpASxOrhS55DyA/aYatq0U6gitZI8MLXw= +go.opentelemetry.io/collector/config/configtelemetry v0.119.0/go.mod h1:SlBEwQg0qly75rXZ6W1Ig8jN25KBVBkFIIAUI1GiAAE= +go.opentelemetry.io/collector/confmap v1.25.0 h1:dLqd6hF4JqcDHl5GWWhc2jXsHs3hkq3KPvU/2Nw5aN4= +go.opentelemetry.io/collector/confmap v1.25.0/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/consumer v1.25.0 h1:qCJa7Hh7lY3vYWgwcEgTGSjjITLCn+BSsya8LxjpoPY= +go.opentelemetry.io/collector/consumer v1.25.0/go.mod h1:ToBfr3BexnhHuxC8/XszkKP/YtkgsGd0yjFMQXNwvT8= +go.opentelemetry.io/collector/consumer/consumererror v0.119.0 h1:M6QXK3KLWnNLlUWOBgz+WQI//W9M8r9qVGWUA3mc5LM= +go.opentelemetry.io/collector/consumer/consumererror v0.119.0/go.mod h1:UNnNkr+ZQJhAMNE5v1n86lXbJrSYb+1ePcI98gV6xvo= +go.opentelemetry.io/collector/consumer/consumertest v0.119.0 h1:hZxdlvfOBzy/rl6mIyrannM4M+7zyv7C947f6W9Leio= +go.opentelemetry.io/collector/consumer/consumertest v0.119.0/go.mod h1:pfXxA2CCwbieymnX0ShZuHjwrWzmxJapsb8ZiSqojVc= +go.opentelemetry.io/collector/consumer/xconsumer v0.119.0 h1:s9DrRdb1kYXy2psr34zGG5sI+F4GRBIhjvEsh7C7FtE= +go.opentelemetry.io/collector/consumer/xconsumer v0.119.0/go.mod h1:3fvk+0hd4WMv76+oUUNah0rQ35dZzH3zyMMCg9MtsuY= +go.opentelemetry.io/collector/exporter v0.119.0 h1:eVHmkeB5HQY/FcoP62l7O4Q0cAZ97LwLhZiAQoQeBtU= +go.opentelemetry.io/collector/exporter v0.119.0/go.mod h1:xMF9mT01tXHX2NjfMRV8o9YyhPBZOR4Wt+srkTy1thM= +go.opentelemetry.io/collector/exporter/exportertest v0.119.0 h1:saABJIiyYyqWEBvGe2VVf5rMMpHdwB83nD6feNZ33nA= +go.opentelemetry.io/collector/exporter/exportertest v0.119.0/go.mod h1:S82pMkj1gWdivxVRKqaRJvGMgVRntKVI5dWAgs23KI8= +go.opentelemetry.io/collector/exporter/xexporter v0.119.0 h1:bCUFRa/of+iPrJoXyzJ5cbOv/hWDHw87bnDRFQJ/JVU= +go.opentelemetry.io/collector/exporter/xexporter v0.119.0/go.mod h1:naV2XoiJv8bvOt7Vs9h6aDWmJnuD1SRnDqkIFRINYlI= +go.opentelemetry.io/collector/extension v0.119.0 h1:Itkt3jqYLjkhoX4kWhICuhXQEQz332W7UL6DpmaNHMc= +go.opentelemetry.io/collector/extension v0.119.0/go.mod h1:yMpvs58Z9F3UpSoE4w/1q/EEKlLFZBOQ2muzzikRvO8= +go.opentelemetry.io/collector/extension/extensiontest v0.119.0 h1:sAdIBRJ6Df7jdkHWY/pSEYTersxURkUz9pENKl73n6s= +go.opentelemetry.io/collector/extension/extensiontest v0.119.0/go.mod h1:XQbUTXneJ//xt58eu5ofHhzWQcQ24GRTbBMWHCEsipA= +go.opentelemetry.io/collector/extension/xextension v0.119.0 h1:uSUvha4yxk5jWevhepsQ56QSAOkk3Z4M0vcPEJeZ6UU= +go.opentelemetry.io/collector/extension/xextension v0.119.0/go.mod h1:2DSTP2IEFfCC+2IFzl1eG9bCKsBkxIQjIphziJ0+vuo= +go.opentelemetry.io/collector/featuregate v1.25.0 h1:3b857fvoY9xBcE5qtLUE1/nlQ65teuW9d8CKr6MykYc= +go.opentelemetry.io/collector/featuregate v1.25.0/go.mod h1:3GaXqflNDVwWndNGBJ1+XJFy3Fv/XrFgjMN60N3z7yg= +go.opentelemetry.io/collector/pdata v1.25.0 h1:AmgBklQfbfy0lT8qsoJtRuYMZ7ZV3VZvkvhjSDentrg= +go.opentelemetry.io/collector/pdata v1.25.0/go.mod h1:Zs7D4RXOGS7E2faGc/jfWdbmhoiHBxA7QbpuJOioxq8= +go.opentelemetry.io/collector/pdata/pprofile v0.119.0 h1:sVtv/MhQ3NDLkgHOWDF9BdTtThNyXdOUiz5+poRkYLQ= +go.opentelemetry.io/collector/pdata/pprofile v0.119.0/go.mod h1:ur4388PjUpmwG5HoSMzrLCPkR0gNVLT4lekcJMRPt8A= +go.opentelemetry.io/collector/pdata/testdata v0.119.0 h1:a3OiuLYx7CaEQQ8LxMhPIM804eIGlNM6Pd0XoACXWMI= +go.opentelemetry.io/collector/pdata/testdata v0.119.0/go.mod h1:stCgL1fKOVp93mI4ocHy/xBMhkW3TXr8VetH4X86q8g= +go.opentelemetry.io/collector/pipeline v0.119.0 h1:NebdPIOBIzU7CdOE36hNrCrUML+XOTR9Zsoy43E7MVk= +go.opentelemetry.io/collector/pipeline v0.119.0/go.mod h1:qE3DmoB05AW0C3lmPvdxZqd/H4po84NPzd5MrqgtL74= +go.opentelemetry.io/collector/receiver v0.119.0 h1:ZatoS4POR+XDkN1WwAv18Ism9f/FUsIjtVT4MIZbQS0= +go.opentelemetry.io/collector/receiver v0.119.0/go.mod h1:JUSsVwyKKQVD/Fy3T98OHOlVHE15Z7juba5RQzG3AXc= +go.opentelemetry.io/collector/receiver/receivertest v0.119.0 h1:thZkyftPCNit/m2bUUC+zaR1+hbXoSkCDtNN/vZIZSg= +go.opentelemetry.io/collector/receiver/receivertest v0.119.0/go.mod h1:DZM70vofnquGkQiTfT5ZSFZlohxANl9XOrVq9h5IKnc= +go.opentelemetry.io/collector/receiver/xreceiver v0.119.0 h1:ZcTO+h+r9TyR1XgMhA7FTSTV9RF+z/IDPrcRIg1l56U= +go.opentelemetry.io/collector/receiver/xreceiver v0.119.0/go.mod h1:AkoWhnYFMygK7Tlzez398ti20NqydX8wxPVWU86+baE= go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY= go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI= go.opentelemetry.io/otel/metric v1.34.0 h1:+eTR3U0MyfWjRDhmFMxe2SsW64QrZ84AOhvqS7Y+PoQ= @@ -459,8 +459,8 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98 google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f h1:OxYkA3wjPsZyBylwymxSHa7ViiW1Sml4ToBrncvFehI= -google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f/go.mod h1:+2Yz8+CLJbIfL9z73EW45avw8Lmge3xVElCP9zEKi50= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250124145028-65684f501c47 h1:91mG8dNTpkC0uChJUQ9zCiRqx3GEEFOWaRZ0mI6Oj2I= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250124145028-65684f501c47/go.mod h1:+2Yz8+CLJbIfL9z73EW45avw8Lmge3xVElCP9zEKi50= google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.22.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= @@ -469,8 +469,8 @@ google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQ google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.69.4 h1:MF5TftSMkd8GLw/m0KM6V8CMOCY6NZ1NQDPGFgbTt4A= -google.golang.org/grpc v1.69.4/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4= +google.golang.org/grpc v1.70.0 h1:pWFv03aZoHzlRKHWicjsZytKAiYCtNS0dHbXnIdq7jQ= +google.golang.org/grpc v1.70.0/go.mod h1:ofIJqVKDXx/JiXrwr2IG4/zwdH9txy3IlF40RmcJSQw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -482,8 +482,8 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.36.3 h1:82DV7MYdb8anAVi3qge1wSnMDrnKK7ebr+I0hHRN1BU= -google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/protobuf v1.36.4 h1:6A3ZDJHn/eNqc1i+IdefRzy/9PokBTPvcqMySR7NNIM= +google.golang.org/protobuf v1.36.4/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/collector/exporters/googlecloudstorageexporter/go.mod b/collector/exporters/googlecloudstorageexporter/go.mod index 4858831afe..96645c52c8 100644 --- a/collector/exporters/googlecloudstorageexporter/go.mod +++ b/collector/exporters/googlecloudstorageexporter/go.mod @@ -5,13 +5,13 @@ go 1.23.0 require ( cloud.google.com/go/storage v1.30.1 github.com/stretchr/testify v1.10.0 - go.opentelemetry.io/collector/component v0.118.0 - go.opentelemetry.io/collector/component/componenttest v0.118.0 - go.opentelemetry.io/collector/confmap v1.24.0 - go.opentelemetry.io/collector/consumer v1.24.0 - go.opentelemetry.io/collector/exporter v0.118.0 - go.opentelemetry.io/collector/exporter/exportertest v0.118.0 - go.opentelemetry.io/collector/pdata v1.24.0 + go.opentelemetry.io/collector/component v0.119.0 + go.opentelemetry.io/collector/component/componenttest v0.119.0 + go.opentelemetry.io/collector/confmap v1.25.0 + go.opentelemetry.io/collector/consumer v1.25.0 + go.opentelemetry.io/collector/exporter v0.119.0 + go.opentelemetry.io/collector/exporter/exportertest v0.119.0 + go.opentelemetry.io/collector/pdata v1.25.0 go.opentelemetry.io/otel/metric v1.34.0 go.opentelemetry.io/otel/trace v1.34.0 go.uber.org/goleak v1.3.0 @@ -45,20 +45,20 @@ require ( github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect go.opencensus.io v0.24.0 // indirect go.opentelemetry.io/auto/sdk v1.1.0 // indirect - go.opentelemetry.io/collector/config/configretry v1.24.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.118.0 // indirect - go.opentelemetry.io/collector/consumer/consumererror v0.118.0 // indirect - go.opentelemetry.io/collector/consumer/consumertest v0.118.0 // indirect - go.opentelemetry.io/collector/consumer/xconsumer v0.118.0 // indirect - go.opentelemetry.io/collector/exporter/xexporter v0.118.0 // indirect - go.opentelemetry.io/collector/extension v0.118.0 // indirect - go.opentelemetry.io/collector/extension/xextension v0.118.0 // indirect - go.opentelemetry.io/collector/featuregate v1.24.0 // indirect - go.opentelemetry.io/collector/pdata/pprofile v0.118.0 // indirect - go.opentelemetry.io/collector/pipeline v0.118.0 // indirect - go.opentelemetry.io/collector/receiver v0.118.0 // indirect - go.opentelemetry.io/collector/receiver/receivertest v0.118.0 // indirect - go.opentelemetry.io/collector/receiver/xreceiver v0.118.0 // indirect + go.opentelemetry.io/collector/config/configretry v1.25.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.119.0 // indirect + go.opentelemetry.io/collector/consumer/consumererror v0.119.0 // indirect + go.opentelemetry.io/collector/consumer/consumertest v0.119.0 // indirect + go.opentelemetry.io/collector/consumer/xconsumer v0.119.0 // indirect + go.opentelemetry.io/collector/exporter/xexporter v0.119.0 // indirect + go.opentelemetry.io/collector/extension v0.119.0 // indirect + go.opentelemetry.io/collector/extension/xextension v0.119.0 // indirect + go.opentelemetry.io/collector/featuregate v1.25.0 // indirect + go.opentelemetry.io/collector/pdata/pprofile v0.119.0 // indirect + go.opentelemetry.io/collector/pipeline v0.119.0 // indirect + 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/otel v1.34.0 // indirect go.opentelemetry.io/otel/sdk v1.34.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.34.0 // indirect @@ -73,7 +73,7 @@ require ( google.golang.org/genproto v0.0.0-20231212172506-995d672761c0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect - google.golang.org/grpc v1.69.4 // indirect - google.golang.org/protobuf v1.36.3 // indirect + google.golang.org/grpc v1.70.0 // indirect + google.golang.org/protobuf v1.36.4 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/collector/exporters/googlecloudstorageexporter/go.sum b/collector/exporters/googlecloudstorageexporter/go.sum index 925e0661de..cf641b24bc 100644 --- a/collector/exporters/googlecloudstorageexporter/go.sum +++ b/collector/exporters/googlecloudstorageexporter/go.sum @@ -290,52 +290,52 @@ go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/collector/component v0.118.0 h1:sSO/ObxJ+yH77Z4DmT1mlSuxhbgUmY1ztt7xCA1F/8w= -go.opentelemetry.io/collector/component v0.118.0/go.mod h1:LUJ3AL2b+tmFr3hZol3hzKzCMvNdqNq0M5CF3SWdv4M= -go.opentelemetry.io/collector/component/componenttest v0.118.0 h1:knEHckoiL2fEWSIc0iehg39zP4IXzi9sHa45O+oxKo8= -go.opentelemetry.io/collector/component/componenttest v0.118.0/go.mod h1:aHc7t7zVwCpbhrWIWY+GMuaMxMCUP8C8P7pJOt8r/vU= -go.opentelemetry.io/collector/config/configretry v1.24.0 h1:sIPHhNNY2YlHMIJ//63iMxIqlgDeGczId0uUb1njsPM= -go.opentelemetry.io/collector/config/configretry v1.24.0/go.mod h1:cleBc9I0DIWpTiiHfu9v83FUaCTqcPXmebpLxjEIqro= -go.opentelemetry.io/collector/config/configtelemetry v0.118.0 h1:UlN46EViG2X42odWtXgWaqY7Y01ZKpsnswSwXTWx5mM= -go.opentelemetry.io/collector/config/configtelemetry v0.118.0/go.mod h1:SlBEwQg0qly75rXZ6W1Ig8jN25KBVBkFIIAUI1GiAAE= -go.opentelemetry.io/collector/confmap v1.24.0 h1:UUHVhkDCsVw14jPOarug9PDQE2vaB2ELPWMr7ARFBCA= -go.opentelemetry.io/collector/confmap v1.24.0/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= -go.opentelemetry.io/collector/consumer v1.24.0 h1:7DeyBm9qdr1EPuCfPjWyChPK16DbVc0wZeSa9LZprFU= -go.opentelemetry.io/collector/consumer v1.24.0/go.mod h1:0G6jvZprIp4dpKMD1ZxCjriiP9GdFvFMObsQEtTk71s= -go.opentelemetry.io/collector/consumer/consumererror v0.118.0 h1:Cx//ZFDa6wUEoRDRYRZ/Rkb52dWNoHj2e9FdlcM9jCA= -go.opentelemetry.io/collector/consumer/consumererror v0.118.0/go.mod h1:2mhnzzLYR5zS2Zz4h9ZnRM8Uogu9qatcfQwGNenhing= -go.opentelemetry.io/collector/consumer/consumertest v0.118.0 h1:8AAS9ejQapP1zqt0+cI6u+AUBheT3X0171N9WtXWsVY= -go.opentelemetry.io/collector/consumer/consumertest v0.118.0/go.mod h1:spRM2wyGr4QZzqMHlLmZnqRCxqXN4Wd0piogC4Qb5PQ= -go.opentelemetry.io/collector/consumer/xconsumer v0.118.0 h1:guWnzzRqgCInjnYlOQ1BPrimppNGIVvnknAjlIbWXuY= -go.opentelemetry.io/collector/consumer/xconsumer v0.118.0/go.mod h1:C5V2d6Ys/Fi6k3tzjBmbdZ9v3J/rZSAMlhx4KVcMIIg= -go.opentelemetry.io/collector/exporter v0.118.0 h1:PE0vF2U+znOB8OVLPWNw40bGCoT/5QquQ8Xbz4i9Rb0= -go.opentelemetry.io/collector/exporter v0.118.0/go.mod h1:5ST3gxT/RzE/vg2bcGDtWJxlQF1ypwk50UpmdK1kUqY= -go.opentelemetry.io/collector/exporter/exportertest v0.118.0 h1:8gWky42BcJsxoaqWbnqCDUjP3Y84hjC6RD/UWHwR7sI= -go.opentelemetry.io/collector/exporter/exportertest v0.118.0/go.mod h1:UbpQBZvznA8YPqqcKlafVIhB6Qa4fPf2+I67MUGyNqo= -go.opentelemetry.io/collector/exporter/xexporter v0.118.0 h1:PZAo1CFhZHfQwtzUNj+Fwcv/21pWHJHTsrIddD096fw= -go.opentelemetry.io/collector/exporter/xexporter v0.118.0/go.mod h1:x4J+qyrRcp4DfWKqK3DLZomFTIUhedsqCQWqq6Gqps4= -go.opentelemetry.io/collector/extension v0.118.0 h1:9o5jLCTRvs0+rtFDx04zTBuB4WFrE0RvtVCPovYV0sA= -go.opentelemetry.io/collector/extension v0.118.0/go.mod h1:BFwB0WOlse6JnrStO44+k9kwUVjjtseFEHhJLHD7lBg= -go.opentelemetry.io/collector/extension/extensiontest v0.118.0 h1:rKBUaFS9elGfENG45wANmrwx7mHsmt1+YWCzxjftElg= -go.opentelemetry.io/collector/extension/extensiontest v0.118.0/go.mod h1:CqNXzkIOR32D8EUpptpOXhpFkibs3kFlRyNMEgIW8l4= -go.opentelemetry.io/collector/extension/xextension v0.118.0 h1:P6gvJzqnH9ma2QfnWde/E6Xu9bAzuefzIwm5iupiVPE= -go.opentelemetry.io/collector/extension/xextension v0.118.0/go.mod h1:ne4Q8ZtRlbC0Etr2hTcVkjOpVM2bE2xy1u+R80LUkDw= -go.opentelemetry.io/collector/featuregate v1.24.0 h1:DEqDsuJgxjZ3E5JNC9hXCd4sWGFiF7h9kaziODuqwFY= -go.opentelemetry.io/collector/featuregate v1.24.0/go.mod h1:3GaXqflNDVwWndNGBJ1+XJFy3Fv/XrFgjMN60N3z7yg= -go.opentelemetry.io/collector/pdata v1.24.0 h1:D6j92eAzmAbQgivNBUnt8r9juOl8ugb+ihYynoFZIEg= -go.opentelemetry.io/collector/pdata v1.24.0/go.mod h1:cf3/W9E/uIvPS4MR26SnMFJhraUCattzzM6qusuONuc= -go.opentelemetry.io/collector/pdata/pprofile v0.118.0 h1:VK/fr65VFOwEhsSGRPj5c3lCv0yIK1Kt0sZxv9WZBb8= -go.opentelemetry.io/collector/pdata/pprofile v0.118.0/go.mod h1:eJyP/vBm179EghV3dPSnamGAWQwLyd+4z/3yG54YFoQ= -go.opentelemetry.io/collector/pdata/testdata v0.118.0 h1:5N0w1SX9KIRkwvtkrpzQgXy9eGk3vfNG0ds6mhEPMIM= -go.opentelemetry.io/collector/pdata/testdata v0.118.0/go.mod h1:UY+GHV5bOC1BnFburOZ0wiHReJj1XbW12mi2Ogbc5Lw= -go.opentelemetry.io/collector/pipeline v0.118.0 h1:RI1DMe7L0+5hGkx0EDGxG00TaJoh96MEQppgOlGx1Oc= -go.opentelemetry.io/collector/pipeline v0.118.0/go.mod h1:qE3DmoB05AW0C3lmPvdxZqd/H4po84NPzd5MrqgtL74= -go.opentelemetry.io/collector/receiver v0.118.0 h1:X4mspHmbbtwdCQZ7o370kNmdWfxRnK1FrsvEShCCKEc= -go.opentelemetry.io/collector/receiver v0.118.0/go.mod h1:wFyfu6sgrkDPLQoGOGMuChGZzkZnYcI/tPJWV4CRTzs= -go.opentelemetry.io/collector/receiver/receivertest v0.118.0 h1:XlMr2mPsyXJsMUOqCpEoY3uCPsLZQbNA5fmVNDGB7Bw= -go.opentelemetry.io/collector/receiver/receivertest v0.118.0/go.mod h1:dtu/H1RNjhy11hTVf/XUfc02uGufMhYYdhhYBbglcUg= -go.opentelemetry.io/collector/receiver/xreceiver v0.118.0 h1:dzECve9e0H3ot0JWnWPuQr9Y84RhOYSd0+CjvJskx7Y= -go.opentelemetry.io/collector/receiver/xreceiver v0.118.0/go.mod h1:Lv1nD/mSYSP64iV8k+C+mWWZZOMLRubv9d1SUory3/E= +go.opentelemetry.io/collector/component v0.119.0 h1:ZVp9myF1Bc4BLa1V4C15Jy/VpqKPPhvbxpe9pP1mPMc= +go.opentelemetry.io/collector/component v0.119.0/go.mod h1:wtuWxFl+Ky9E/5+t2FwHoLyADDiBFFDdx8fN3fEs0n8= +go.opentelemetry.io/collector/component/componenttest v0.119.0 h1:nVlBmKSu56zO/qCcNgDYCQsRoWAL+NPkrkIPAbapdQM= +go.opentelemetry.io/collector/component/componenttest v0.119.0/go.mod h1:H6KVzLkNhB/deEijLcq91Kjgs9Oshx2ZsFAwaMcuTLs= +go.opentelemetry.io/collector/config/configretry v1.25.0 h1:PelzRkTJ9zGxwdJha7pPtvR91GrgL/OzkY/MwyXYRUE= +go.opentelemetry.io/collector/config/configretry v1.25.0/go.mod h1:cleBc9I0DIWpTiiHfu9v83FUaCTqcPXmebpLxjEIqro= +go.opentelemetry.io/collector/config/configtelemetry v0.119.0 h1:gAgMUEVXZKgpASxOrhS55DyA/aYatq0U6gitZI8MLXw= +go.opentelemetry.io/collector/config/configtelemetry v0.119.0/go.mod h1:SlBEwQg0qly75rXZ6W1Ig8jN25KBVBkFIIAUI1GiAAE= +go.opentelemetry.io/collector/confmap v1.25.0 h1:dLqd6hF4JqcDHl5GWWhc2jXsHs3hkq3KPvU/2Nw5aN4= +go.opentelemetry.io/collector/confmap v1.25.0/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/consumer v1.25.0 h1:qCJa7Hh7lY3vYWgwcEgTGSjjITLCn+BSsya8LxjpoPY= +go.opentelemetry.io/collector/consumer v1.25.0/go.mod h1:ToBfr3BexnhHuxC8/XszkKP/YtkgsGd0yjFMQXNwvT8= +go.opentelemetry.io/collector/consumer/consumererror v0.119.0 h1:M6QXK3KLWnNLlUWOBgz+WQI//W9M8r9qVGWUA3mc5LM= +go.opentelemetry.io/collector/consumer/consumererror v0.119.0/go.mod h1:UNnNkr+ZQJhAMNE5v1n86lXbJrSYb+1ePcI98gV6xvo= +go.opentelemetry.io/collector/consumer/consumertest v0.119.0 h1:hZxdlvfOBzy/rl6mIyrannM4M+7zyv7C947f6W9Leio= +go.opentelemetry.io/collector/consumer/consumertest v0.119.0/go.mod h1:pfXxA2CCwbieymnX0ShZuHjwrWzmxJapsb8ZiSqojVc= +go.opentelemetry.io/collector/consumer/xconsumer v0.119.0 h1:s9DrRdb1kYXy2psr34zGG5sI+F4GRBIhjvEsh7C7FtE= +go.opentelemetry.io/collector/consumer/xconsumer v0.119.0/go.mod h1:3fvk+0hd4WMv76+oUUNah0rQ35dZzH3zyMMCg9MtsuY= +go.opentelemetry.io/collector/exporter v0.119.0 h1:eVHmkeB5HQY/FcoP62l7O4Q0cAZ97LwLhZiAQoQeBtU= +go.opentelemetry.io/collector/exporter v0.119.0/go.mod h1:xMF9mT01tXHX2NjfMRV8o9YyhPBZOR4Wt+srkTy1thM= +go.opentelemetry.io/collector/exporter/exportertest v0.119.0 h1:saABJIiyYyqWEBvGe2VVf5rMMpHdwB83nD6feNZ33nA= +go.opentelemetry.io/collector/exporter/exportertest v0.119.0/go.mod h1:S82pMkj1gWdivxVRKqaRJvGMgVRntKVI5dWAgs23KI8= +go.opentelemetry.io/collector/exporter/xexporter v0.119.0 h1:bCUFRa/of+iPrJoXyzJ5cbOv/hWDHw87bnDRFQJ/JVU= +go.opentelemetry.io/collector/exporter/xexporter v0.119.0/go.mod h1:naV2XoiJv8bvOt7Vs9h6aDWmJnuD1SRnDqkIFRINYlI= +go.opentelemetry.io/collector/extension v0.119.0 h1:Itkt3jqYLjkhoX4kWhICuhXQEQz332W7UL6DpmaNHMc= +go.opentelemetry.io/collector/extension v0.119.0/go.mod h1:yMpvs58Z9F3UpSoE4w/1q/EEKlLFZBOQ2muzzikRvO8= +go.opentelemetry.io/collector/extension/extensiontest v0.119.0 h1:sAdIBRJ6Df7jdkHWY/pSEYTersxURkUz9pENKl73n6s= +go.opentelemetry.io/collector/extension/extensiontest v0.119.0/go.mod h1:XQbUTXneJ//xt58eu5ofHhzWQcQ24GRTbBMWHCEsipA= +go.opentelemetry.io/collector/extension/xextension v0.119.0 h1:uSUvha4yxk5jWevhepsQ56QSAOkk3Z4M0vcPEJeZ6UU= +go.opentelemetry.io/collector/extension/xextension v0.119.0/go.mod h1:2DSTP2IEFfCC+2IFzl1eG9bCKsBkxIQjIphziJ0+vuo= +go.opentelemetry.io/collector/featuregate v1.25.0 h1:3b857fvoY9xBcE5qtLUE1/nlQ65teuW9d8CKr6MykYc= +go.opentelemetry.io/collector/featuregate v1.25.0/go.mod h1:3GaXqflNDVwWndNGBJ1+XJFy3Fv/XrFgjMN60N3z7yg= +go.opentelemetry.io/collector/pdata v1.25.0 h1:AmgBklQfbfy0lT8qsoJtRuYMZ7ZV3VZvkvhjSDentrg= +go.opentelemetry.io/collector/pdata v1.25.0/go.mod h1:Zs7D4RXOGS7E2faGc/jfWdbmhoiHBxA7QbpuJOioxq8= +go.opentelemetry.io/collector/pdata/pprofile v0.119.0 h1:sVtv/MhQ3NDLkgHOWDF9BdTtThNyXdOUiz5+poRkYLQ= +go.opentelemetry.io/collector/pdata/pprofile v0.119.0/go.mod h1:ur4388PjUpmwG5HoSMzrLCPkR0gNVLT4lekcJMRPt8A= +go.opentelemetry.io/collector/pdata/testdata v0.119.0 h1:a3OiuLYx7CaEQQ8LxMhPIM804eIGlNM6Pd0XoACXWMI= +go.opentelemetry.io/collector/pdata/testdata v0.119.0/go.mod h1:stCgL1fKOVp93mI4ocHy/xBMhkW3TXr8VetH4X86q8g= +go.opentelemetry.io/collector/pipeline v0.119.0 h1:NebdPIOBIzU7CdOE36hNrCrUML+XOTR9Zsoy43E7MVk= +go.opentelemetry.io/collector/pipeline v0.119.0/go.mod h1:qE3DmoB05AW0C3lmPvdxZqd/H4po84NPzd5MrqgtL74= +go.opentelemetry.io/collector/receiver v0.119.0 h1:ZatoS4POR+XDkN1WwAv18Ism9f/FUsIjtVT4MIZbQS0= +go.opentelemetry.io/collector/receiver v0.119.0/go.mod h1:JUSsVwyKKQVD/Fy3T98OHOlVHE15Z7juba5RQzG3AXc= +go.opentelemetry.io/collector/receiver/receivertest v0.119.0 h1:thZkyftPCNit/m2bUUC+zaR1+hbXoSkCDtNN/vZIZSg= +go.opentelemetry.io/collector/receiver/receivertest v0.119.0/go.mod h1:DZM70vofnquGkQiTfT5ZSFZlohxANl9XOrVq9h5IKnc= +go.opentelemetry.io/collector/receiver/xreceiver v0.119.0 h1:ZcTO+h+r9TyR1XgMhA7FTSTV9RF+z/IDPrcRIg1l56U= +go.opentelemetry.io/collector/receiver/xreceiver v0.119.0/go.mod h1:AkoWhnYFMygK7Tlzez398ti20NqydX8wxPVWU86+baE= go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY= go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI= go.opentelemetry.io/otel/metric v1.34.0 h1:+eTR3U0MyfWjRDhmFMxe2SsW64QrZ84AOhvqS7Y+PoQ= @@ -491,8 +491,8 @@ google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8 google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.69.4 h1:MF5TftSMkd8GLw/m0KM6V8CMOCY6NZ1NQDPGFgbTt4A= -google.golang.org/grpc v1.69.4/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4= +google.golang.org/grpc v1.70.0 h1:pWFv03aZoHzlRKHWicjsZytKAiYCtNS0dHbXnIdq7jQ= +google.golang.org/grpc v1.70.0/go.mod h1:ofIJqVKDXx/JiXrwr2IG4/zwdH9txy3IlF40RmcJSQw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -504,8 +504,8 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.36.3 h1:82DV7MYdb8anAVi3qge1wSnMDrnKK7ebr+I0hHRN1BU= -google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/protobuf v1.36.4 h1:6A3ZDJHn/eNqc1i+IdefRzy/9PokBTPvcqMySR7NNIM= +google.golang.org/protobuf v1.36.4/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/collector/exporters/mockdestinationexporter/go.mod b/collector/exporters/mockdestinationexporter/go.mod index b64a2d82fc..bf72c3870c 100644 --- a/collector/exporters/mockdestinationexporter/go.mod +++ b/collector/exporters/mockdestinationexporter/go.mod @@ -4,13 +4,13 @@ go 1.23.0 require ( github.com/stretchr/testify v1.10.0 - go.opentelemetry.io/collector/component v0.118.0 - go.opentelemetry.io/collector/component/componenttest v0.118.0 - go.opentelemetry.io/collector/confmap v1.24.0 - go.opentelemetry.io/collector/consumer v1.24.0 - go.opentelemetry.io/collector/exporter v0.118.0 - go.opentelemetry.io/collector/exporter/exportertest v0.118.0 - go.opentelemetry.io/collector/pdata v1.24.0 + go.opentelemetry.io/collector/component v0.119.0 + go.opentelemetry.io/collector/component/componenttest v0.119.0 + go.opentelemetry.io/collector/confmap v1.25.0 + go.opentelemetry.io/collector/consumer v1.25.0 + go.opentelemetry.io/collector/exporter v0.119.0 + go.opentelemetry.io/collector/exporter/exportertest v0.119.0 + go.opentelemetry.io/collector/pdata v1.25.0 go.opentelemetry.io/otel/metric v1.34.0 go.opentelemetry.io/otel/trace v1.34.0 go.uber.org/goleak v1.3.0 @@ -35,20 +35,20 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect go.opentelemetry.io/auto/sdk v1.1.0 // indirect - go.opentelemetry.io/collector/config/configretry v1.24.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.118.0 // indirect - go.opentelemetry.io/collector/consumer/consumererror v0.118.0 // indirect - go.opentelemetry.io/collector/consumer/consumertest v0.118.0 // indirect - go.opentelemetry.io/collector/consumer/xconsumer v0.118.0 // indirect - go.opentelemetry.io/collector/exporter/xexporter v0.118.0 // indirect - go.opentelemetry.io/collector/extension v0.118.0 // indirect - go.opentelemetry.io/collector/extension/xextension v0.118.0 // indirect - go.opentelemetry.io/collector/featuregate v1.24.0 // indirect - go.opentelemetry.io/collector/pdata/pprofile v0.118.0 // indirect - go.opentelemetry.io/collector/pipeline v0.118.0 // indirect - go.opentelemetry.io/collector/receiver v0.118.0 // indirect - go.opentelemetry.io/collector/receiver/receivertest v0.118.0 // indirect - go.opentelemetry.io/collector/receiver/xreceiver v0.118.0 // indirect + go.opentelemetry.io/collector/config/configretry v1.25.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.119.0 // indirect + go.opentelemetry.io/collector/consumer/consumererror v0.119.0 // indirect + go.opentelemetry.io/collector/consumer/consumertest v0.119.0 // indirect + go.opentelemetry.io/collector/consumer/xconsumer v0.119.0 // indirect + go.opentelemetry.io/collector/exporter/xexporter v0.119.0 // indirect + go.opentelemetry.io/collector/extension v0.119.0 // indirect + go.opentelemetry.io/collector/extension/xextension v0.119.0 // indirect + go.opentelemetry.io/collector/featuregate v1.25.0 // indirect + go.opentelemetry.io/collector/pdata/pprofile v0.119.0 // indirect + go.opentelemetry.io/collector/pipeline v0.119.0 // indirect + 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/otel v1.34.0 // indirect go.opentelemetry.io/otel/sdk v1.34.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.34.0 // indirect @@ -56,8 +56,8 @@ require ( golang.org/x/net v0.34.0 // indirect golang.org/x/sys v0.29.0 // indirect golang.org/x/text v0.21.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect - google.golang.org/grpc v1.69.4 // indirect - google.golang.org/protobuf v1.36.3 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20250124145028-65684f501c47 // indirect + google.golang.org/grpc v1.70.0 // indirect + google.golang.org/protobuf v1.36.4 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/collector/exporters/mockdestinationexporter/go.sum b/collector/exporters/mockdestinationexporter/go.sum index 7638116f33..ad6e189c0f 100644 --- a/collector/exporters/mockdestinationexporter/go.sum +++ b/collector/exporters/mockdestinationexporter/go.sum @@ -263,52 +263,52 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/collector/component v0.118.0 h1:sSO/ObxJ+yH77Z4DmT1mlSuxhbgUmY1ztt7xCA1F/8w= -go.opentelemetry.io/collector/component v0.118.0/go.mod h1:LUJ3AL2b+tmFr3hZol3hzKzCMvNdqNq0M5CF3SWdv4M= -go.opentelemetry.io/collector/component/componenttest v0.118.0 h1:knEHckoiL2fEWSIc0iehg39zP4IXzi9sHa45O+oxKo8= -go.opentelemetry.io/collector/component/componenttest v0.118.0/go.mod h1:aHc7t7zVwCpbhrWIWY+GMuaMxMCUP8C8P7pJOt8r/vU= -go.opentelemetry.io/collector/config/configretry v1.24.0 h1:sIPHhNNY2YlHMIJ//63iMxIqlgDeGczId0uUb1njsPM= -go.opentelemetry.io/collector/config/configretry v1.24.0/go.mod h1:cleBc9I0DIWpTiiHfu9v83FUaCTqcPXmebpLxjEIqro= -go.opentelemetry.io/collector/config/configtelemetry v0.118.0 h1:UlN46EViG2X42odWtXgWaqY7Y01ZKpsnswSwXTWx5mM= -go.opentelemetry.io/collector/config/configtelemetry v0.118.0/go.mod h1:SlBEwQg0qly75rXZ6W1Ig8jN25KBVBkFIIAUI1GiAAE= -go.opentelemetry.io/collector/confmap v1.24.0 h1:UUHVhkDCsVw14jPOarug9PDQE2vaB2ELPWMr7ARFBCA= -go.opentelemetry.io/collector/confmap v1.24.0/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= -go.opentelemetry.io/collector/consumer v1.24.0 h1:7DeyBm9qdr1EPuCfPjWyChPK16DbVc0wZeSa9LZprFU= -go.opentelemetry.io/collector/consumer v1.24.0/go.mod h1:0G6jvZprIp4dpKMD1ZxCjriiP9GdFvFMObsQEtTk71s= -go.opentelemetry.io/collector/consumer/consumererror v0.118.0 h1:Cx//ZFDa6wUEoRDRYRZ/Rkb52dWNoHj2e9FdlcM9jCA= -go.opentelemetry.io/collector/consumer/consumererror v0.118.0/go.mod h1:2mhnzzLYR5zS2Zz4h9ZnRM8Uogu9qatcfQwGNenhing= -go.opentelemetry.io/collector/consumer/consumertest v0.118.0 h1:8AAS9ejQapP1zqt0+cI6u+AUBheT3X0171N9WtXWsVY= -go.opentelemetry.io/collector/consumer/consumertest v0.118.0/go.mod h1:spRM2wyGr4QZzqMHlLmZnqRCxqXN4Wd0piogC4Qb5PQ= -go.opentelemetry.io/collector/consumer/xconsumer v0.118.0 h1:guWnzzRqgCInjnYlOQ1BPrimppNGIVvnknAjlIbWXuY= -go.opentelemetry.io/collector/consumer/xconsumer v0.118.0/go.mod h1:C5V2d6Ys/Fi6k3tzjBmbdZ9v3J/rZSAMlhx4KVcMIIg= -go.opentelemetry.io/collector/exporter v0.118.0 h1:PE0vF2U+znOB8OVLPWNw40bGCoT/5QquQ8Xbz4i9Rb0= -go.opentelemetry.io/collector/exporter v0.118.0/go.mod h1:5ST3gxT/RzE/vg2bcGDtWJxlQF1ypwk50UpmdK1kUqY= -go.opentelemetry.io/collector/exporter/exportertest v0.118.0 h1:8gWky42BcJsxoaqWbnqCDUjP3Y84hjC6RD/UWHwR7sI= -go.opentelemetry.io/collector/exporter/exportertest v0.118.0/go.mod h1:UbpQBZvznA8YPqqcKlafVIhB6Qa4fPf2+I67MUGyNqo= -go.opentelemetry.io/collector/exporter/xexporter v0.118.0 h1:PZAo1CFhZHfQwtzUNj+Fwcv/21pWHJHTsrIddD096fw= -go.opentelemetry.io/collector/exporter/xexporter v0.118.0/go.mod h1:x4J+qyrRcp4DfWKqK3DLZomFTIUhedsqCQWqq6Gqps4= -go.opentelemetry.io/collector/extension v0.118.0 h1:9o5jLCTRvs0+rtFDx04zTBuB4WFrE0RvtVCPovYV0sA= -go.opentelemetry.io/collector/extension v0.118.0/go.mod h1:BFwB0WOlse6JnrStO44+k9kwUVjjtseFEHhJLHD7lBg= -go.opentelemetry.io/collector/extension/extensiontest v0.118.0 h1:rKBUaFS9elGfENG45wANmrwx7mHsmt1+YWCzxjftElg= -go.opentelemetry.io/collector/extension/extensiontest v0.118.0/go.mod h1:CqNXzkIOR32D8EUpptpOXhpFkibs3kFlRyNMEgIW8l4= -go.opentelemetry.io/collector/extension/xextension v0.118.0 h1:P6gvJzqnH9ma2QfnWde/E6Xu9bAzuefzIwm5iupiVPE= -go.opentelemetry.io/collector/extension/xextension v0.118.0/go.mod h1:ne4Q8ZtRlbC0Etr2hTcVkjOpVM2bE2xy1u+R80LUkDw= -go.opentelemetry.io/collector/featuregate v1.24.0 h1:DEqDsuJgxjZ3E5JNC9hXCd4sWGFiF7h9kaziODuqwFY= -go.opentelemetry.io/collector/featuregate v1.24.0/go.mod h1:3GaXqflNDVwWndNGBJ1+XJFy3Fv/XrFgjMN60N3z7yg= -go.opentelemetry.io/collector/pdata v1.24.0 h1:D6j92eAzmAbQgivNBUnt8r9juOl8ugb+ihYynoFZIEg= -go.opentelemetry.io/collector/pdata v1.24.0/go.mod h1:cf3/W9E/uIvPS4MR26SnMFJhraUCattzzM6qusuONuc= -go.opentelemetry.io/collector/pdata/pprofile v0.118.0 h1:VK/fr65VFOwEhsSGRPj5c3lCv0yIK1Kt0sZxv9WZBb8= -go.opentelemetry.io/collector/pdata/pprofile v0.118.0/go.mod h1:eJyP/vBm179EghV3dPSnamGAWQwLyd+4z/3yG54YFoQ= -go.opentelemetry.io/collector/pdata/testdata v0.118.0 h1:5N0w1SX9KIRkwvtkrpzQgXy9eGk3vfNG0ds6mhEPMIM= -go.opentelemetry.io/collector/pdata/testdata v0.118.0/go.mod h1:UY+GHV5bOC1BnFburOZ0wiHReJj1XbW12mi2Ogbc5Lw= -go.opentelemetry.io/collector/pipeline v0.118.0 h1:RI1DMe7L0+5hGkx0EDGxG00TaJoh96MEQppgOlGx1Oc= -go.opentelemetry.io/collector/pipeline v0.118.0/go.mod h1:qE3DmoB05AW0C3lmPvdxZqd/H4po84NPzd5MrqgtL74= -go.opentelemetry.io/collector/receiver v0.118.0 h1:X4mspHmbbtwdCQZ7o370kNmdWfxRnK1FrsvEShCCKEc= -go.opentelemetry.io/collector/receiver v0.118.0/go.mod h1:wFyfu6sgrkDPLQoGOGMuChGZzkZnYcI/tPJWV4CRTzs= -go.opentelemetry.io/collector/receiver/receivertest v0.118.0 h1:XlMr2mPsyXJsMUOqCpEoY3uCPsLZQbNA5fmVNDGB7Bw= -go.opentelemetry.io/collector/receiver/receivertest v0.118.0/go.mod h1:dtu/H1RNjhy11hTVf/XUfc02uGufMhYYdhhYBbglcUg= -go.opentelemetry.io/collector/receiver/xreceiver v0.118.0 h1:dzECve9e0H3ot0JWnWPuQr9Y84RhOYSd0+CjvJskx7Y= -go.opentelemetry.io/collector/receiver/xreceiver v0.118.0/go.mod h1:Lv1nD/mSYSP64iV8k+C+mWWZZOMLRubv9d1SUory3/E= +go.opentelemetry.io/collector/component v0.119.0 h1:ZVp9myF1Bc4BLa1V4C15Jy/VpqKPPhvbxpe9pP1mPMc= +go.opentelemetry.io/collector/component v0.119.0/go.mod h1:wtuWxFl+Ky9E/5+t2FwHoLyADDiBFFDdx8fN3fEs0n8= +go.opentelemetry.io/collector/component/componenttest v0.119.0 h1:nVlBmKSu56zO/qCcNgDYCQsRoWAL+NPkrkIPAbapdQM= +go.opentelemetry.io/collector/component/componenttest v0.119.0/go.mod h1:H6KVzLkNhB/deEijLcq91Kjgs9Oshx2ZsFAwaMcuTLs= +go.opentelemetry.io/collector/config/configretry v1.25.0 h1:PelzRkTJ9zGxwdJha7pPtvR91GrgL/OzkY/MwyXYRUE= +go.opentelemetry.io/collector/config/configretry v1.25.0/go.mod h1:cleBc9I0DIWpTiiHfu9v83FUaCTqcPXmebpLxjEIqro= +go.opentelemetry.io/collector/config/configtelemetry v0.119.0 h1:gAgMUEVXZKgpASxOrhS55DyA/aYatq0U6gitZI8MLXw= +go.opentelemetry.io/collector/config/configtelemetry v0.119.0/go.mod h1:SlBEwQg0qly75rXZ6W1Ig8jN25KBVBkFIIAUI1GiAAE= +go.opentelemetry.io/collector/confmap v1.25.0 h1:dLqd6hF4JqcDHl5GWWhc2jXsHs3hkq3KPvU/2Nw5aN4= +go.opentelemetry.io/collector/confmap v1.25.0/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/consumer v1.25.0 h1:qCJa7Hh7lY3vYWgwcEgTGSjjITLCn+BSsya8LxjpoPY= +go.opentelemetry.io/collector/consumer v1.25.0/go.mod h1:ToBfr3BexnhHuxC8/XszkKP/YtkgsGd0yjFMQXNwvT8= +go.opentelemetry.io/collector/consumer/consumererror v0.119.0 h1:M6QXK3KLWnNLlUWOBgz+WQI//W9M8r9qVGWUA3mc5LM= +go.opentelemetry.io/collector/consumer/consumererror v0.119.0/go.mod h1:UNnNkr+ZQJhAMNE5v1n86lXbJrSYb+1ePcI98gV6xvo= +go.opentelemetry.io/collector/consumer/consumertest v0.119.0 h1:hZxdlvfOBzy/rl6mIyrannM4M+7zyv7C947f6W9Leio= +go.opentelemetry.io/collector/consumer/consumertest v0.119.0/go.mod h1:pfXxA2CCwbieymnX0ShZuHjwrWzmxJapsb8ZiSqojVc= +go.opentelemetry.io/collector/consumer/xconsumer v0.119.0 h1:s9DrRdb1kYXy2psr34zGG5sI+F4GRBIhjvEsh7C7FtE= +go.opentelemetry.io/collector/consumer/xconsumer v0.119.0/go.mod h1:3fvk+0hd4WMv76+oUUNah0rQ35dZzH3zyMMCg9MtsuY= +go.opentelemetry.io/collector/exporter v0.119.0 h1:eVHmkeB5HQY/FcoP62l7O4Q0cAZ97LwLhZiAQoQeBtU= +go.opentelemetry.io/collector/exporter v0.119.0/go.mod h1:xMF9mT01tXHX2NjfMRV8o9YyhPBZOR4Wt+srkTy1thM= +go.opentelemetry.io/collector/exporter/exportertest v0.119.0 h1:saABJIiyYyqWEBvGe2VVf5rMMpHdwB83nD6feNZ33nA= +go.opentelemetry.io/collector/exporter/exportertest v0.119.0/go.mod h1:S82pMkj1gWdivxVRKqaRJvGMgVRntKVI5dWAgs23KI8= +go.opentelemetry.io/collector/exporter/xexporter v0.119.0 h1:bCUFRa/of+iPrJoXyzJ5cbOv/hWDHw87bnDRFQJ/JVU= +go.opentelemetry.io/collector/exporter/xexporter v0.119.0/go.mod h1:naV2XoiJv8bvOt7Vs9h6aDWmJnuD1SRnDqkIFRINYlI= +go.opentelemetry.io/collector/extension v0.119.0 h1:Itkt3jqYLjkhoX4kWhICuhXQEQz332W7UL6DpmaNHMc= +go.opentelemetry.io/collector/extension v0.119.0/go.mod h1:yMpvs58Z9F3UpSoE4w/1q/EEKlLFZBOQ2muzzikRvO8= +go.opentelemetry.io/collector/extension/extensiontest v0.119.0 h1:sAdIBRJ6Df7jdkHWY/pSEYTersxURkUz9pENKl73n6s= +go.opentelemetry.io/collector/extension/extensiontest v0.119.0/go.mod h1:XQbUTXneJ//xt58eu5ofHhzWQcQ24GRTbBMWHCEsipA= +go.opentelemetry.io/collector/extension/xextension v0.119.0 h1:uSUvha4yxk5jWevhepsQ56QSAOkk3Z4M0vcPEJeZ6UU= +go.opentelemetry.io/collector/extension/xextension v0.119.0/go.mod h1:2DSTP2IEFfCC+2IFzl1eG9bCKsBkxIQjIphziJ0+vuo= +go.opentelemetry.io/collector/featuregate v1.25.0 h1:3b857fvoY9xBcE5qtLUE1/nlQ65teuW9d8CKr6MykYc= +go.opentelemetry.io/collector/featuregate v1.25.0/go.mod h1:3GaXqflNDVwWndNGBJ1+XJFy3Fv/XrFgjMN60N3z7yg= +go.opentelemetry.io/collector/pdata v1.25.0 h1:AmgBklQfbfy0lT8qsoJtRuYMZ7ZV3VZvkvhjSDentrg= +go.opentelemetry.io/collector/pdata v1.25.0/go.mod h1:Zs7D4RXOGS7E2faGc/jfWdbmhoiHBxA7QbpuJOioxq8= +go.opentelemetry.io/collector/pdata/pprofile v0.119.0 h1:sVtv/MhQ3NDLkgHOWDF9BdTtThNyXdOUiz5+poRkYLQ= +go.opentelemetry.io/collector/pdata/pprofile v0.119.0/go.mod h1:ur4388PjUpmwG5HoSMzrLCPkR0gNVLT4lekcJMRPt8A= +go.opentelemetry.io/collector/pdata/testdata v0.119.0 h1:a3OiuLYx7CaEQQ8LxMhPIM804eIGlNM6Pd0XoACXWMI= +go.opentelemetry.io/collector/pdata/testdata v0.119.0/go.mod h1:stCgL1fKOVp93mI4ocHy/xBMhkW3TXr8VetH4X86q8g= +go.opentelemetry.io/collector/pipeline v0.119.0 h1:NebdPIOBIzU7CdOE36hNrCrUML+XOTR9Zsoy43E7MVk= +go.opentelemetry.io/collector/pipeline v0.119.0/go.mod h1:qE3DmoB05AW0C3lmPvdxZqd/H4po84NPzd5MrqgtL74= +go.opentelemetry.io/collector/receiver v0.119.0 h1:ZatoS4POR+XDkN1WwAv18Ism9f/FUsIjtVT4MIZbQS0= +go.opentelemetry.io/collector/receiver v0.119.0/go.mod h1:JUSsVwyKKQVD/Fy3T98OHOlVHE15Z7juba5RQzG3AXc= +go.opentelemetry.io/collector/receiver/receivertest v0.119.0 h1:thZkyftPCNit/m2bUUC+zaR1+hbXoSkCDtNN/vZIZSg= +go.opentelemetry.io/collector/receiver/receivertest v0.119.0/go.mod h1:DZM70vofnquGkQiTfT5ZSFZlohxANl9XOrVq9h5IKnc= +go.opentelemetry.io/collector/receiver/xreceiver v0.119.0 h1:ZcTO+h+r9TyR1XgMhA7FTSTV9RF+z/IDPrcRIg1l56U= +go.opentelemetry.io/collector/receiver/xreceiver v0.119.0/go.mod h1:AkoWhnYFMygK7Tlzez398ti20NqydX8wxPVWU86+baE= go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY= go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI= go.opentelemetry.io/otel/metric v1.34.0 h1:+eTR3U0MyfWjRDhmFMxe2SsW64QrZ84AOhvqS7Y+PoQ= @@ -438,8 +438,8 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98 google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f h1:OxYkA3wjPsZyBylwymxSHa7ViiW1Sml4ToBrncvFehI= -google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f/go.mod h1:+2Yz8+CLJbIfL9z73EW45avw8Lmge3xVElCP9zEKi50= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250124145028-65684f501c47 h1:91mG8dNTpkC0uChJUQ9zCiRqx3GEEFOWaRZ0mI6Oj2I= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250124145028-65684f501c47/go.mod h1:+2Yz8+CLJbIfL9z73EW45avw8Lmge3xVElCP9zEKi50= google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.22.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= @@ -448,8 +448,8 @@ google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQ google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.69.4 h1:MF5TftSMkd8GLw/m0KM6V8CMOCY6NZ1NQDPGFgbTt4A= -google.golang.org/grpc v1.69.4/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4= +google.golang.org/grpc v1.70.0 h1:pWFv03aZoHzlRKHWicjsZytKAiYCtNS0dHbXnIdq7jQ= +google.golang.org/grpc v1.70.0/go.mod h1:ofIJqVKDXx/JiXrwr2IG4/zwdH9txy3IlF40RmcJSQw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -461,8 +461,8 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.36.3 h1:82DV7MYdb8anAVi3qge1wSnMDrnKK7ebr+I0hHRN1BU= -google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/protobuf v1.36.4 h1:6A3ZDJHn/eNqc1i+IdefRzy/9PokBTPvcqMySR7NNIM= +google.golang.org/protobuf v1.36.4/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/collector/internal/tools/go.mod b/collector/internal/tools/go.mod index ca52d1020f..a8f92f7507 100644 --- a/collector/internal/tools/go.mod +++ b/collector/internal/tools/go.mod @@ -12,7 +12,7 @@ require ( github.com/ory/go-acc v0.2.8 github.com/pavius/impi v0.0.3 github.com/tcnksm/ghr v0.16.2 - go.opentelemetry.io/collector/cmd/mdatagen v0.118.0 + go.opentelemetry.io/collector/cmd/mdatagen v0.119.0 golang.org/x/tools v0.28.0 golang.org/x/vuln v1.1.0 ) @@ -155,7 +155,7 @@ require ( github.com/polyfloyd/go-errorlint v1.5.1 // indirect github.com/prometheus/client_golang v1.20.5 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.61.0 // indirect + github.com/prometheus/common v0.62.0 // indirect github.com/prometheus/procfs v0.15.1 // indirect github.com/quasilyte/go-ruleguard v0.4.2 // indirect github.com/quasilyte/go-ruleguard/dsl v0.3.22 // indirect @@ -206,15 +206,14 @@ require ( gitlab.com/bosi/decorder v0.4.2 // indirect go-simpler.org/musttag v0.12.1 // indirect go-simpler.org/sloglint v0.6.0 // indirect - go.opentelemetry.io/collector/component v0.118.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.118.0 // indirect - go.opentelemetry.io/collector/confmap v1.24.0 // indirect - go.opentelemetry.io/collector/confmap/provider/fileprovider v1.24.0 // indirect - go.opentelemetry.io/collector/filter v0.118.0 // indirect - go.opentelemetry.io/collector/pdata v1.24.0 // indirect + go.opentelemetry.io/collector/component v0.119.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.119.0 // indirect + go.opentelemetry.io/collector/confmap v1.25.0 // indirect + go.opentelemetry.io/collector/confmap/provider/fileprovider v1.25.0 // indirect + go.opentelemetry.io/collector/filter v0.119.0 // indirect + go.opentelemetry.io/collector/pdata v1.25.0 // indirect go.opentelemetry.io/otel v1.34.0 // indirect go.opentelemetry.io/otel/metric v1.34.0 // indirect - go.opentelemetry.io/otel/sdk/metric v1.34.0 // indirect go.opentelemetry.io/otel/trace v1.34.0 // indirect go.uber.org/automaxprocs v1.5.3 // indirect go.uber.org/multierr v1.11.0 // indirect @@ -229,8 +228,8 @@ require ( golang.org/x/sys v0.29.0 // indirect golang.org/x/text v0.21.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect - google.golang.org/grpc v1.69.4 // indirect - google.golang.org/protobuf v1.36.3 // indirect + google.golang.org/grpc v1.70.0 // indirect + google.golang.org/protobuf v1.36.4 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/collector/internal/tools/go.sum b/collector/internal/tools/go.sum index 6bb5549b2e..ea8a68336a 100644 --- a/collector/internal/tools/go.sum +++ b/collector/internal/tools/go.sum @@ -557,8 +557,8 @@ github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y8 github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= -github.com/prometheus/common v0.61.0 h1:3gv/GThfX0cV2lpO7gkTUwZru38mxevy90Bj8YFSRQQ= -github.com/prometheus/common v0.61.0/go.mod h1:zr29OCN/2BsJRaFwG8QOBr41D6kkchKbpeNH7pAjb/s= +github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io= +github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= @@ -732,20 +732,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/collector/cmd/mdatagen v0.118.0 h1:xQFvnY93L1oQD5yXcJvb0EGXWDrHbufGOGLpkb6uHvA= -go.opentelemetry.io/collector/cmd/mdatagen v0.118.0/go.mod h1:pEpmLTbKjx3Az/U/mW2wzxDWd0MxCTVTDdGYfHw2EeE= -go.opentelemetry.io/collector/component v0.118.0 h1:sSO/ObxJ+yH77Z4DmT1mlSuxhbgUmY1ztt7xCA1F/8w= -go.opentelemetry.io/collector/component v0.118.0/go.mod h1:LUJ3AL2b+tmFr3hZol3hzKzCMvNdqNq0M5CF3SWdv4M= -go.opentelemetry.io/collector/config/configtelemetry v0.118.0 h1:UlN46EViG2X42odWtXgWaqY7Y01ZKpsnswSwXTWx5mM= -go.opentelemetry.io/collector/config/configtelemetry v0.118.0/go.mod h1:SlBEwQg0qly75rXZ6W1Ig8jN25KBVBkFIIAUI1GiAAE= -go.opentelemetry.io/collector/confmap v1.24.0 h1:UUHVhkDCsVw14jPOarug9PDQE2vaB2ELPWMr7ARFBCA= -go.opentelemetry.io/collector/confmap v1.24.0/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= -go.opentelemetry.io/collector/confmap/provider/fileprovider v1.24.0 h1:QoQulv9L20MhD1TFWH1scbRoo0bxbZqF2quh1VRNMh4= -go.opentelemetry.io/collector/confmap/provider/fileprovider v1.24.0/go.mod h1:ljIH/rWIUHJeWIDEKMRU/ufol/bcgC7ufamchtuTAwM= -go.opentelemetry.io/collector/filter v0.118.0 h1:mvf08g5VHUcyhqobqId2bVGhgcs1RNR69INGlT0LEsA= -go.opentelemetry.io/collector/filter v0.118.0/go.mod h1:Pgii0Ad2PXdxYSYYqki6Mr4gZdueJG9rDOiaB3fXf3Q= -go.opentelemetry.io/collector/pdata v1.24.0 h1:D6j92eAzmAbQgivNBUnt8r9juOl8ugb+ihYynoFZIEg= -go.opentelemetry.io/collector/pdata v1.24.0/go.mod h1:cf3/W9E/uIvPS4MR26SnMFJhraUCattzzM6qusuONuc= +go.opentelemetry.io/collector/cmd/mdatagen v0.119.0 h1:NtfRqqxUMvUObdZWC0+hmJxzOsevkrHwm9ZNG7B+ct8= +go.opentelemetry.io/collector/cmd/mdatagen v0.119.0/go.mod h1:uITecUpy5CYdgU0Qg+PsAjDx3IIKPct0D+ECCsYIOnI= +go.opentelemetry.io/collector/component v0.119.0 h1:ZVp9myF1Bc4BLa1V4C15Jy/VpqKPPhvbxpe9pP1mPMc= +go.opentelemetry.io/collector/component v0.119.0/go.mod h1:wtuWxFl+Ky9E/5+t2FwHoLyADDiBFFDdx8fN3fEs0n8= +go.opentelemetry.io/collector/config/configtelemetry v0.119.0 h1:gAgMUEVXZKgpASxOrhS55DyA/aYatq0U6gitZI8MLXw= +go.opentelemetry.io/collector/config/configtelemetry v0.119.0/go.mod h1:SlBEwQg0qly75rXZ6W1Ig8jN25KBVBkFIIAUI1GiAAE= +go.opentelemetry.io/collector/confmap v1.25.0 h1:dLqd6hF4JqcDHl5GWWhc2jXsHs3hkq3KPvU/2Nw5aN4= +go.opentelemetry.io/collector/confmap v1.25.0/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/provider/fileprovider v1.25.0 h1:0Bbay2ow6eQVKMxuota2i1/iIMRhE988hxoY/67Zfqw= +go.opentelemetry.io/collector/confmap/provider/fileprovider v1.25.0/go.mod h1:5xaAHjqx9mlcXxDCeUrZXkEfWk9suMqMKspK41XNelc= +go.opentelemetry.io/collector/filter v0.119.0 h1:uAoF9h7iTHlQE/AnIborqUwwT+Qtw+UnXfr4vEkzY0o= +go.opentelemetry.io/collector/filter v0.119.0/go.mod h1:mRiDt6ZAi+uN11FBwQ8z86k/SBn3PMwzP46cGz2thEc= +go.opentelemetry.io/collector/pdata v1.25.0 h1:AmgBklQfbfy0lT8qsoJtRuYMZ7ZV3VZvkvhjSDentrg= +go.opentelemetry.io/collector/pdata v1.25.0/go.mod h1:Zs7D4RXOGS7E2faGc/jfWdbmhoiHBxA7QbpuJOioxq8= go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY= go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI= go.opentelemetry.io/otel/metric v1.34.0 h1:+eTR3U0MyfWjRDhmFMxe2SsW64QrZ84AOhvqS7Y+PoQ= @@ -979,8 +979,8 @@ google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQ google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.69.4 h1:MF5TftSMkd8GLw/m0KM6V8CMOCY6NZ1NQDPGFgbTt4A= -google.golang.org/grpc v1.69.4/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4= +google.golang.org/grpc v1.70.0 h1:pWFv03aZoHzlRKHWicjsZytKAiYCtNS0dHbXnIdq7jQ= +google.golang.org/grpc v1.70.0/go.mod h1:ofIJqVKDXx/JiXrwr2IG4/zwdH9txy3IlF40RmcJSQw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -992,8 +992,8 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.36.3 h1:82DV7MYdb8anAVi3qge1wSnMDrnKK7ebr+I0hHRN1BU= -google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/protobuf v1.36.4 h1:6A3ZDJHn/eNqc1i+IdefRzy/9PokBTPvcqMySR7NNIM= +google.golang.org/protobuf v1.36.4/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/collector/odigosotelcol/components.go b/collector/odigosotelcol/components.go index 3da6ad61b8..e47cac619e 100644 --- a/collector/odigosotelcol/components.go +++ b/collector/odigosotelcol/components.go @@ -114,10 +114,10 @@ func components() (otelcol.Factories, error) { return otelcol.Factories{}, err } factories.ExtensionModules = make(map[component.Type]string, len(factories.Extensions)) - factories.ExtensionModules[zpagesextension.NewFactory().Type()] = "go.opentelemetry.io/collector/extension/zpagesextension v0.118.0" - factories.ExtensionModules[healthcheckextension.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.118.0" - factories.ExtensionModules[pprofextension.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.118.0" - factories.ExtensionModules[basicauthextension.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.118.0" + factories.ExtensionModules[zpagesextension.NewFactory().Type()] = "go.opentelemetry.io/collector/extension/zpagesextension v0.119.0" + factories.ExtensionModules[healthcheckextension.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.119.0" + factories.ExtensionModules[pprofextension.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.119.0" + factories.ExtensionModules[basicauthextension.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.119.0" factories.Receivers, err = receiver.MakeFactoryMap( otlpreceiver.NewFactory(), @@ -131,12 +131,12 @@ func components() (otelcol.Factories, error) { return otelcol.Factories{}, err } factories.ReceiverModules = make(map[component.Type]string, len(factories.Receivers)) - factories.ReceiverModules[otlpreceiver.NewFactory().Type()] = "go.opentelemetry.io/collector/receiver/otlpreceiver v0.118.0" - factories.ReceiverModules[zipkinreceiver.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.118.0" - factories.ReceiverModules[filelogreceiver.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.118.0" - factories.ReceiverModules[kubeletstatsreceiver.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.118.0" - factories.ReceiverModules[hostmetricsreceiver.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.118.0" - factories.ReceiverModules[prometheusreceiver.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.118.0" + factories.ReceiverModules[otlpreceiver.NewFactory().Type()] = "go.opentelemetry.io/collector/receiver/otlpreceiver v0.119.0" + factories.ReceiverModules[zipkinreceiver.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.119.0" + factories.ReceiverModules[filelogreceiver.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.119.0" + factories.ReceiverModules[kubeletstatsreceiver.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.119.0" + factories.ReceiverModules[hostmetricsreceiver.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.119.0" + factories.ReceiverModules[prometheusreceiver.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.119.0" factories.Exporters, err = exporter.MakeFactoryMap( debugexporter.NewFactory(), @@ -187,49 +187,49 @@ func components() (otelcol.Factories, error) { return otelcol.Factories{}, err } factories.ExporterModules = make(map[component.Type]string, len(factories.Exporters)) - factories.ExporterModules[debugexporter.NewFactory().Type()] = "go.opentelemetry.io/collector/exporter/debugexporter v0.118.0" - factories.ExporterModules[nopexporter.NewFactory().Type()] = "go.opentelemetry.io/collector/exporter/nopexporter v0.118.0" - factories.ExporterModules[otlpexporter.NewFactory().Type()] = "go.opentelemetry.io/collector/exporter/otlpexporter v0.118.0" - factories.ExporterModules[otlphttpexporter.NewFactory().Type()] = "go.opentelemetry.io/collector/exporter/otlphttpexporter v0.118.0" - factories.ExporterModules[azureblobstorageexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/odigos/exporter/azureblobstorageexporter v0.118.0" - factories.ExporterModules[googlecloudstorageexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/odigos/exporter/googlecloudstorageexporter v0.118.0" - factories.ExporterModules[mockdestinationexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/odigos/exporter/mockdestinationexporter v0.118.0" - factories.ExporterModules[awss3exporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awss3exporter v0.118.0" - factories.ExporterModules[awsxrayexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.118.0" - factories.ExporterModules[azuredataexplorerexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azuredataexplorerexporter v0.118.0" - factories.ExporterModules[azuremonitorexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azuremonitorexporter v0.118.0" - factories.ExporterModules[carbonexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter v0.118.0" - factories.ExporterModules[clickhouseexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/clickhouseexporter v0.118.0" - factories.ExporterModules[cassandraexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/cassandraexporter v0.118.0" - factories.ExporterModules[coralogixexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/coralogixexporter v0.118.0" - factories.ExporterModules[datadogexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.118.0" - factories.ExporterModules[datasetexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datasetexporter v0.118.0" - factories.ExporterModules[elasticsearchexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter v0.118.0" - factories.ExporterModules[fileexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.118.0" - factories.ExporterModules[googlecloudexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudexporter v0.118.0" - factories.ExporterModules[googlecloudpubsubexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudpubsubexporter v0.118.0" - factories.ExporterModules[googlemanagedprometheusexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlemanagedprometheusexporter v0.118.0" - factories.ExporterModules[honeycombmarkerexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/honeycombmarkerexporter v0.118.0" - factories.ExporterModules[influxdbexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter v0.118.0" - factories.ExporterModules[kafkaexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.118.0" - factories.ExporterModules[loadbalancingexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter v0.118.0" - factories.ExporterModules[logicmonitorexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/logicmonitorexporter v0.118.0" - factories.ExporterModules[logzioexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/logzioexporter v0.118.0" - factories.ExporterModules[lokiexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/lokiexporter v0.118.0" - factories.ExporterModules[mezmoexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/mezmoexporter v0.118.0" - factories.ExporterModules[opencensusexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opencensusexporter v0.118.0" - factories.ExporterModules[opensearchexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opensearchexporter v0.118.0" - factories.ExporterModules[prometheusexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.118.0" - factories.ExporterModules[prometheusremotewriteexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.118.0" - factories.ExporterModules[pulsarexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/pulsarexporter v0.118.0" - factories.ExporterModules[sapmexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.118.0" - factories.ExporterModules[sentryexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sentryexporter v0.118.0" - factories.ExporterModules[signalfxexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.118.0" - factories.ExporterModules[splunkhecexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.118.0" - factories.ExporterModules[sumologicexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sumologicexporter v0.118.0" - factories.ExporterModules[syslogexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/syslogexporter v0.118.0" - factories.ExporterModules[tencentcloudlogserviceexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/tencentcloudlogserviceexporter v0.118.0" - factories.ExporterModules[zipkinexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.118.0" + factories.ExporterModules[debugexporter.NewFactory().Type()] = "go.opentelemetry.io/collector/exporter/debugexporter v0.119.0" + factories.ExporterModules[nopexporter.NewFactory().Type()] = "go.opentelemetry.io/collector/exporter/nopexporter v0.119.0" + factories.ExporterModules[otlpexporter.NewFactory().Type()] = "go.opentelemetry.io/collector/exporter/otlpexporter v0.119.0" + factories.ExporterModules[otlphttpexporter.NewFactory().Type()] = "go.opentelemetry.io/collector/exporter/otlphttpexporter v0.119.0" + factories.ExporterModules[azureblobstorageexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/odigos/exporter/azureblobstorageexporter v0.119.0" + factories.ExporterModules[googlecloudstorageexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/odigos/exporter/googlecloudstorageexporter v0.119.0" + factories.ExporterModules[mockdestinationexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/odigos/exporter/mockdestinationexporter v0.119.0" + factories.ExporterModules[awss3exporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awss3exporter v0.119.0" + factories.ExporterModules[awsxrayexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.119.0" + factories.ExporterModules[azuredataexplorerexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azuredataexplorerexporter v0.119.0" + factories.ExporterModules[azuremonitorexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azuremonitorexporter v0.119.0" + factories.ExporterModules[carbonexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter v0.119.0" + factories.ExporterModules[clickhouseexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/clickhouseexporter v0.119.0" + factories.ExporterModules[cassandraexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/cassandraexporter v0.119.0" + factories.ExporterModules[coralogixexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/coralogixexporter v0.119.0" + factories.ExporterModules[datadogexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.119.0" + factories.ExporterModules[datasetexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datasetexporter v0.119.0" + factories.ExporterModules[elasticsearchexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter v0.119.0" + factories.ExporterModules[fileexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.119.0" + factories.ExporterModules[googlecloudexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudexporter v0.119.0" + factories.ExporterModules[googlecloudpubsubexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudpubsubexporter v0.119.0" + factories.ExporterModules[googlemanagedprometheusexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlemanagedprometheusexporter v0.119.0" + factories.ExporterModules[honeycombmarkerexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/honeycombmarkerexporter v0.119.0" + factories.ExporterModules[influxdbexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter v0.119.0" + factories.ExporterModules[kafkaexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.119.0" + factories.ExporterModules[loadbalancingexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter v0.119.0" + factories.ExporterModules[logicmonitorexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/logicmonitorexporter v0.119.0" + factories.ExporterModules[logzioexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/logzioexporter v0.119.0" + factories.ExporterModules[lokiexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/lokiexporter v0.119.0" + factories.ExporterModules[mezmoexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/mezmoexporter v0.119.0" + factories.ExporterModules[opencensusexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opencensusexporter v0.119.0" + factories.ExporterModules[opensearchexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opensearchexporter v0.119.0" + factories.ExporterModules[prometheusexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.119.0" + factories.ExporterModules[prometheusremotewriteexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.119.0" + factories.ExporterModules[pulsarexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/pulsarexporter v0.119.0" + factories.ExporterModules[sapmexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.119.0" + factories.ExporterModules[sentryexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sentryexporter v0.119.0" + factories.ExporterModules[signalfxexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.119.0" + factories.ExporterModules[splunkhecexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.119.0" + factories.ExporterModules[sumologicexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sumologicexporter v0.119.0" + factories.ExporterModules[syslogexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/syslogexporter v0.119.0" + factories.ExporterModules[tencentcloudlogserviceexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/tencentcloudlogserviceexporter v0.119.0" + factories.ExporterModules[zipkinexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.119.0" factories.Processors, err = processor.MakeFactoryMap( odigosresourcenameprocessor.NewFactory(), @@ -264,33 +264,33 @@ func components() (otelcol.Factories, error) { return otelcol.Factories{}, err } factories.ProcessorModules = make(map[component.Type]string, len(factories.Processors)) - factories.ProcessorModules[odigosresourcenameprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/odigos/processor/odigosresourcenameprocessor v0.118.0" - factories.ProcessorModules[odigossamplingprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/odigos/processor/odigossamplingprocessor v0.118.0" - factories.ProcessorModules[odigosconditionalattributes.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/odigos/processor/odigosconditionalattributes v0.118.0" - factories.ProcessorModules[odigossqldboperationprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/odigos/processor/odigossqldboperationprocessor v0.118.0" - factories.ProcessorModules[batchprocessor.NewFactory().Type()] = "go.opentelemetry.io/collector/processor/batchprocessor v0.118.0" - factories.ProcessorModules[memorylimiterprocessor.NewFactory().Type()] = "go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.118.0" - factories.ProcessorModules[attributesprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.118.0" - factories.ProcessorModules[cumulativetodeltaprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.118.0" - factories.ProcessorModules[deltatorateprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatorateprocessor v0.118.0" - factories.ProcessorModules[filterprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.118.0" - factories.ProcessorModules[groupbyattrsprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor v0.118.0" - factories.ProcessorModules[groupbytraceprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor v0.118.0" - factories.ProcessorModules[k8sattributesprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.118.0" - factories.ProcessorModules[metricsgenerationprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricsgenerationprocessor v0.118.0" - factories.ProcessorModules[metricstransformprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.118.0" - factories.ProcessorModules[probabilisticsamplerprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.118.0" - factories.ProcessorModules[redactionprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/processor/redactionprocessor v0.118.0" - factories.ProcessorModules[resourcedetectionprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.118.0" - factories.ProcessorModules[resourceprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.118.0" - factories.ProcessorModules[routingprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.118.0" - factories.ProcessorModules[sumologicprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/processor/sumologicprocessor v0.118.0" - factories.ProcessorModules[spanprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.118.0" - factories.ProcessorModules[tailsamplingprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.118.0" - factories.ProcessorModules[transformprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.118.0" - factories.ProcessorModules[remotetapprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/processor/remotetapprocessor v0.118.0" - factories.ProcessorModules[odigostrafficmetrics.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/odigos/processor/odigostrafficmetrics v0.118.0" - factories.ProcessorModules[odigossourcesfilterprocessor.NewFactory().Type()] = "github.com/odigos-io/odigos/processor/odigossourcesfilterprocessor v0.118.0" + factories.ProcessorModules[odigosresourcenameprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/odigos/processor/odigosresourcenameprocessor v0.119.0" + factories.ProcessorModules[odigossamplingprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/odigos/processor/odigossamplingprocessor v0.119.0" + factories.ProcessorModules[odigosconditionalattributes.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/odigos/processor/odigosconditionalattributes v0.119.0" + factories.ProcessorModules[odigossqldboperationprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/odigos/processor/odigossqldboperationprocessor v0.119.0" + factories.ProcessorModules[batchprocessor.NewFactory().Type()] = "go.opentelemetry.io/collector/processor/batchprocessor v0.119.0" + factories.ProcessorModules[memorylimiterprocessor.NewFactory().Type()] = "go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.119.0" + factories.ProcessorModules[attributesprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.119.0" + factories.ProcessorModules[cumulativetodeltaprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.119.0" + factories.ProcessorModules[deltatorateprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatorateprocessor v0.119.0" + factories.ProcessorModules[filterprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.119.0" + factories.ProcessorModules[groupbyattrsprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor v0.119.0" + factories.ProcessorModules[groupbytraceprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor v0.119.0" + factories.ProcessorModules[k8sattributesprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.119.0" + factories.ProcessorModules[metricsgenerationprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricsgenerationprocessor v0.119.0" + factories.ProcessorModules[metricstransformprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.119.0" + factories.ProcessorModules[probabilisticsamplerprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.119.0" + factories.ProcessorModules[redactionprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/processor/redactionprocessor v0.119.0" + factories.ProcessorModules[resourcedetectionprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.119.0" + factories.ProcessorModules[resourceprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.119.0" + factories.ProcessorModules[routingprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.119.0" + factories.ProcessorModules[sumologicprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/processor/sumologicprocessor v0.119.0" + factories.ProcessorModules[spanprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.119.0" + factories.ProcessorModules[tailsamplingprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.119.0" + factories.ProcessorModules[transformprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.119.0" + factories.ProcessorModules[remotetapprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/processor/remotetapprocessor v0.119.0" + factories.ProcessorModules[odigostrafficmetrics.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/odigos/processor/odigostrafficmetrics v0.119.0" + factories.ProcessorModules[odigossourcesfilterprocessor.NewFactory().Type()] = "github.com/odigos-io/odigos/processor/odigossourcesfilterprocessor v0.119.0" factories.Connectors, err = connector.MakeFactoryMap( forwardconnector.NewFactory(), @@ -305,13 +305,13 @@ func components() (otelcol.Factories, error) { return otelcol.Factories{}, err } factories.ConnectorModules = make(map[component.Type]string, len(factories.Connectors)) - factories.ConnectorModules[forwardconnector.NewFactory().Type()] = "go.opentelemetry.io/collector/connector/forwardconnector v0.118.0" - factories.ConnectorModules[countconnector.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.118.0" - factories.ConnectorModules[datadogconnector.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.118.0" - factories.ConnectorModules[exceptionsconnector.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector v0.118.0" - factories.ConnectorModules[routingconnector.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector v0.118.0" - factories.ConnectorModules[servicegraphconnector.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.118.0" - factories.ConnectorModules[spanmetricsconnector.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.118.0" + factories.ConnectorModules[forwardconnector.NewFactory().Type()] = "go.opentelemetry.io/collector/connector/forwardconnector v0.119.0" + factories.ConnectorModules[countconnector.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.119.0" + factories.ConnectorModules[datadogconnector.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.119.0" + factories.ConnectorModules[exceptionsconnector.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector v0.119.0" + factories.ConnectorModules[routingconnector.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector v0.119.0" + factories.ConnectorModules[servicegraphconnector.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.119.0" + factories.ConnectorModules[spanmetricsconnector.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.119.0" return factories, nil } diff --git a/collector/odigosotelcol/go.mod b/collector/odigosotelcol/go.mod index 18ef9d137d..57c91b9393 100644 --- a/collector/odigosotelcol/go.mod +++ b/collector/odigosotelcol/go.mod @@ -5,120 +5,120 @@ module odigos.io/opentelemetry-collector/cmd/odigosotelcol go 1.23.0 require ( - github.com/odigos-io/odigos/processor/odigossourcesfilterprocessor v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awss3exporter v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azuredataexplorerexporter v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azuremonitorexporter v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/cassandraexporter v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/clickhouseexporter v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/coralogixexporter v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datasetexporter v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudexporter v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudpubsubexporter v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlemanagedprometheusexporter v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/honeycombmarkerexporter v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/logicmonitorexporter v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/logzioexporter v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/lokiexporter v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/mezmoexporter v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opencensusexporter v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opensearchexporter v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/pulsarexporter v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sentryexporter v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sumologicexporter v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/syslogexporter v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/tencentcloudlogserviceexporter v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/odigos/exporter/azureblobstorageexporter v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/odigos/exporter/googlecloudstorageexporter v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/odigos/exporter/mockdestinationexporter v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/odigos/processor/odigosconditionalattributes v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/odigos/processor/odigosresourcenameprocessor v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/odigos/processor/odigossamplingprocessor v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/odigos/processor/odigossqldboperationprocessor v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/odigos/processor/odigostrafficmetrics v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatorateprocessor v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricsgenerationprocessor v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/redactionprocessor v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/remotetapprocessor v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/sumologicprocessor v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.118.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.118.0 + github.com/odigos-io/odigos/processor/odigossourcesfilterprocessor v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awss3exporter v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azuredataexplorerexporter v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azuremonitorexporter v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/cassandraexporter v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/clickhouseexporter v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/coralogixexporter v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datasetexporter v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudexporter v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudpubsubexporter v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlemanagedprometheusexporter v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/honeycombmarkerexporter v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/logicmonitorexporter v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/logzioexporter v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/lokiexporter v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/mezmoexporter v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opencensusexporter v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opensearchexporter v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/pulsarexporter v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sentryexporter v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sumologicexporter v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/syslogexporter v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/tencentcloudlogserviceexporter v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/odigos/exporter/azureblobstorageexporter v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/odigos/exporter/googlecloudstorageexporter v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/odigos/exporter/mockdestinationexporter v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/odigos/processor/odigosconditionalattributes v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/odigos/processor/odigosresourcenameprocessor v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/odigos/processor/odigossamplingprocessor v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/odigos/processor/odigossqldboperationprocessor v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/odigos/processor/odigostrafficmetrics v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatorateprocessor v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricsgenerationprocessor v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/redactionprocessor v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/remotetapprocessor v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/sumologicprocessor v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.119.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.119.0 github.com/stretchr/testify v1.10.0 - go.opentelemetry.io/collector/component v0.118.0 - go.opentelemetry.io/collector/component/componenttest v0.118.0 - go.opentelemetry.io/collector/confmap v1.24.0 - go.opentelemetry.io/collector/confmap/provider/envprovider v1.24.0 - go.opentelemetry.io/collector/connector v0.118.0 - go.opentelemetry.io/collector/connector/forwardconnector v0.118.0 - go.opentelemetry.io/collector/exporter v0.118.0 - go.opentelemetry.io/collector/exporter/debugexporter v0.118.0 - go.opentelemetry.io/collector/exporter/nopexporter v0.118.0 - go.opentelemetry.io/collector/exporter/otlpexporter v0.118.0 - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.118.0 - go.opentelemetry.io/collector/extension v0.118.0 - go.opentelemetry.io/collector/extension/zpagesextension v0.118.0 - go.opentelemetry.io/collector/odigos/providers/odigosfileprovider v0.118.0 - go.opentelemetry.io/collector/otelcol v0.118.0 - go.opentelemetry.io/collector/processor v0.118.0 - go.opentelemetry.io/collector/processor/batchprocessor v0.118.0 - go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.118.0 - go.opentelemetry.io/collector/receiver v0.118.0 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.118.0 + go.opentelemetry.io/collector/component v0.119.0 + go.opentelemetry.io/collector/component/componenttest v0.119.0 + go.opentelemetry.io/collector/confmap v1.25.0 + go.opentelemetry.io/collector/confmap/provider/envprovider v1.25.0 + go.opentelemetry.io/collector/connector v0.119.0 + go.opentelemetry.io/collector/connector/forwardconnector v0.119.0 + go.opentelemetry.io/collector/exporter v0.119.0 + go.opentelemetry.io/collector/exporter/debugexporter v0.119.0 + go.opentelemetry.io/collector/exporter/nopexporter v0.119.0 + go.opentelemetry.io/collector/exporter/otlpexporter v0.119.0 + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.119.0 + go.opentelemetry.io/collector/extension v0.119.0 + go.opentelemetry.io/collector/extension/zpagesextension v0.119.0 + go.opentelemetry.io/collector/odigos/providers/odigosfileprovider v0.119.0 + go.opentelemetry.io/collector/otelcol v0.119.0 + go.opentelemetry.io/collector/processor v0.119.0 + go.opentelemetry.io/collector/processor/batchprocessor v0.119.0 + go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.119.0 + go.opentelemetry.io/collector/receiver v0.119.0 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.119.0 golang.org/x/sys v0.29.0 ) require ( - cloud.google.com/go v0.116.0 // indirect - cloud.google.com/go/auth v0.13.0 // indirect - cloud.google.com/go/auth/oauth2adapt v0.2.6 // indirect + cloud.google.com/go v0.118.0 // indirect + cloud.google.com/go/auth v0.14.0 // indirect + cloud.google.com/go/auth/oauth2adapt v0.2.7 // indirect cloud.google.com/go/compute/metadata v0.6.0 // indirect - cloud.google.com/go/iam v1.2.2 // indirect - cloud.google.com/go/logging v1.12.0 // indirect - cloud.google.com/go/longrunning v0.6.2 // indirect - cloud.google.com/go/monitoring v1.21.2 // indirect + cloud.google.com/go/iam v1.3.1 // indirect + cloud.google.com/go/logging v1.13.0 // indirect + cloud.google.com/go/longrunning v0.6.4 // indirect + cloud.google.com/go/monitoring v1.22.1 // indirect cloud.google.com/go/pubsub v1.45.3 // indirect cloud.google.com/go/storage v1.43.0 // indirect - cloud.google.com/go/trace v1.11.2 // indirect + cloud.google.com/go/trace v1.11.3 // indirect code.cloudfoundry.org/clock v0.0.0-20180518195852-02e53af36e6c // indirect github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect github.com/99designs/keyring v1.2.1 // indirect @@ -143,13 +143,14 @@ require ( github.com/ClickHouse/ch-go v0.63.1 // indirect github.com/ClickHouse/clickhouse-go/v2 v2.30.1 // indirect github.com/Code-Hex/go-generics-cache v1.5.1 // indirect - github.com/DataDog/agent-payload/v5 v5.0.140 // indirect + github.com/DataDog/agent-payload/v5 v5.0.142 // indirect github.com/DataDog/datadog-agent/comp/core/config v0.61.0 // indirect github.com/DataDog/datadog-agent/comp/core/flare/builder v0.61.0 // indirect github.com/DataDog/datadog-agent/comp/core/flare/types v0.61.0 // indirect github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.61.0 // indirect github.com/DataDog/datadog-agent/comp/core/log/def v0.61.0 // indirect github.com/DataDog/datadog-agent/comp/core/secrets v0.61.0 // indirect + github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.0.0-20241217122454-175edb6c74f2 // indirect github.com/DataDog/datadog-agent/comp/core/telemetry v0.61.0 // indirect github.com/DataDog/datadog-agent/comp/def v0.61.0 // indirect github.com/DataDog/datadog-agent/comp/logs/agent/config v0.61.0 // indirect @@ -181,12 +182,12 @@ require ( github.com/DataDog/datadog-agent/pkg/logs/sources v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/logs/status/statusinterface v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.61.0 // indirect - github.com/DataDog/datadog-agent/pkg/obfuscate v0.61.0 // indirect - github.com/DataDog/datadog-agent/pkg/proto v0.63.0-devel // indirect + github.com/DataDog/datadog-agent/pkg/obfuscate v0.63.0-devel.0.20250123185937-1feb84b482c8 // indirect + github.com/DataDog/datadog-agent/pkg/proto v0.63.0-devel.0.20250123185937-1feb84b482c8 // indirect github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/status/health v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/telemetry v0.61.0 // indirect - github.com/DataDog/datadog-agent/pkg/trace v0.61.0 // indirect + github.com/DataDog/datadog-agent/pkg/trace v0.64.0-devel.0.20250129182827-bab631c10d61 // indirect github.com/DataDog/datadog-agent/pkg/util/backoff v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/cgroups v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/executable v0.61.0 // indirect @@ -194,7 +195,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/fxutil v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/http v0.61.0 // indirect - github.com/DataDog/datadog-agent/pkg/util/log v0.61.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/log v0.63.0-devel.0.20250123185937-1feb84b482c8 // indirect github.com/DataDog/datadog-agent/pkg/util/optional v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/pointer v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.61.0 // indirect @@ -207,7 +208,7 @@ require ( github.com/DataDog/datadog-api-client-go/v2 v2.34.0 // indirect github.com/DataDog/datadog-go/v5 v5.6.0 // indirect github.com/DataDog/dd-sensitive-data-scanner/sds-go/go v0.0.0-20240816154533-f7f9beb53a42 // indirect - github.com/DataDog/go-sqllexer v0.0.16 // indirect + github.com/DataDog/go-sqllexer v0.0.20 // indirect github.com/DataDog/go-tuf v1.1.0-0.5.2 // indirect github.com/DataDog/gohai v0.0.0-20230524154621-4316413895ee // indirect github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.24.0 // indirect @@ -219,11 +220,11 @@ require ( github.com/DataDog/viper v1.14.0 // indirect github.com/DataDog/zstd v1.5.6 // indirect github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962 // indirect - github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.25.0 // indirect - github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.49.0 // indirect - github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.49.0 // indirect - github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.25.0 // indirect - github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.49.0 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.26.0 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.50.0 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.50.0 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.26.0 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.50.0 // indirect github.com/IBM/sarama v1.45.0 // indirect github.com/Microsoft/go-winio v0.6.2 // indirect github.com/Showmax/go-fqdn v1.0.0 // indirect @@ -239,31 +240,31 @@ require ( github.com/armon/go-radix v1.0.0 // indirect github.com/aws/aws-msk-iam-sasl-signer-go v1.0.0 // indirect github.com/aws/aws-sdk-go v1.55.6 // indirect - github.com/aws/aws-sdk-go-v2 v1.33.0 // indirect - github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.7 // indirect - github.com/aws/aws-sdk-go-v2/config v1.29.1 // indirect - github.com/aws/aws-sdk-go-v2/credentials v1.17.54 // indirect - github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.24 // indirect - github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.52 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.28 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.28 // indirect - github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect - github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.28 // indirect - github.com/aws/aws-sdk-go-v2/service/ec2 v1.200.0 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.5.2 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.9 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.9 // indirect - github.com/aws/aws-sdk-go-v2/service/s3 v1.73.2 // indirect - github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.34.6 // indirect - github.com/aws/aws-sdk-go-v2/service/sso v1.24.11 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.10 // indirect - github.com/aws/aws-sdk-go-v2/service/sts v1.33.9 // indirect - github.com/aws/smithy-go v1.22.1 // indirect + github.com/aws/aws-sdk-go-v2 v1.34.0 // indirect + github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.8 // indirect + github.com/aws/aws-sdk-go-v2/config v1.29.2 // indirect + github.com/aws/aws-sdk-go-v2/credentials v1.17.55 // indirect + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.25 // indirect + github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.54 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.29 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.29 // indirect + github.com/aws/aws-sdk-go-v2/internal/ini v1.8.2 // indirect + github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.29 // indirect + github.com/aws/aws-sdk-go-v2/service/ec2 v1.202.0 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.2 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.5.3 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.10 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.10 // indirect + github.com/aws/aws-sdk-go-v2/service/s3 v1.74.1 // indirect + github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.34.7 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.24.12 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.11 // indirect + github.com/aws/aws-sdk-go-v2/service/sts v1.33.10 // indirect + github.com/aws/smithy-go v1.22.2 // indirect github.com/benbjohnson/clock v1.3.5 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/bits-and-blooms/bitset v1.4.0 // indirect - github.com/bmatcuk/doublestar/v4 v4.8.0 // indirect + github.com/bmatcuk/doublestar/v4 v4.8.1 // indirect github.com/briandowns/spinner v1.23.0 // indirect github.com/cenkalti/backoff v2.2.1+incompatible // indirect github.com/cenkalti/backoff/v4 v4.3.0 // indirect @@ -271,14 +272,14 @@ require ( github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 // indirect - github.com/containerd/cgroups/v3 v3.0.3 // indirect + github.com/containerd/cgroups/v3 v3.0.5 // indirect github.com/coreos/go-systemd/v22 v22.5.0 // indirect github.com/danieljoos/wincred v1.1.2 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/dennwc/varint v1.0.0 // indirect github.com/digitalocean/godo v1.118.0 // indirect github.com/distribution/reference v0.6.0 // indirect - github.com/docker/docker v27.5.0+incompatible // indirect + github.com/docker/docker v27.5.1+incompatible // indirect github.com/docker/go-connections v0.5.0 // indirect github.com/docker/go-units v0.5.0 // indirect github.com/dustin/go-humanize v1.0.1 // indirect @@ -319,23 +320,23 @@ require ( github.com/go-viper/mapstructure/v2 v2.2.1 // indirect github.com/go-zookeeper/zk v1.0.3 // indirect github.com/gobwas/glob v0.2.3 // indirect - github.com/goccy/go-json v0.10.4 // indirect + github.com/goccy/go-json v0.10.5 // indirect github.com/gocql/gocql v1.7.0 // indirect github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect - github.com/godbus/dbus/v5 v5.0.6 // indirect + github.com/godbus/dbus/v5 v5.1.0 // indirect github.com/gofrs/uuid v4.4.0+incompatible // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-jwt/jwt/v4 v4.5.1 // indirect github.com/golang-jwt/jwt/v5 v5.2.1 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect - github.com/golang/mock v1.6.0 // indirect + github.com/golang/mock v1.7.0-rc.1 // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/google/go-cmp v0.6.0 // indirect github.com/google/go-querystring v1.1.0 // indirect github.com/google/gofuzz v1.2.0 // indirect - github.com/google/s2a-go v0.1.8 // indirect + github.com/google/s2a-go v0.1.9 // indirect github.com/google/uuid v1.6.0 // indirect github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect github.com/googleapis/gax-go/v2 v2.14.1 // indirect @@ -412,6 +413,7 @@ require ( github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/moby/docker-image-spec v1.3.1 // indirect + github.com/moby/sys/userns v0.1.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect @@ -419,46 +421,47 @@ require ( github.com/mtibben/percent v0.2.1 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/extension/sumologicextension v0.118.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.118.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.118.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.118.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.118.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.118.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/metrics v0.118.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.118.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.118.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.118.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.118.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.118.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil v0.118.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.118.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.118.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.118.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.118.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/datadog v0.118.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.118.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka/topic v0.118.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.118.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.118.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.118.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/sampling v0.118.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.118.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.118.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/loki v0.118.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.118.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.118.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheusremotewrite v0.118.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/signalfx v0.118.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.118.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/extension/sumologicextension v0.119.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.119.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.119.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.119.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.119.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.119.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/metrics v0.119.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.119.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.119.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.119.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.119.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.119.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil v0.119.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.119.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.119.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.119.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.119.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils v0.119.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/datadog v0.119.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.119.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka/topic v0.119.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.119.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.119.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.119.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/sampling v0.119.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.119.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.119.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/loki v0.119.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.119.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.119.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheusremotewrite v0.119.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/signalfx v0.119.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.119.0 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.1.0 // indirect - github.com/opencontainers/runtime-spec v1.1.0-rc.3 // indirect + github.com/opencontainers/runtime-spec v1.2.0 // indirect github.com/opensearch-project/opensearch-go/v2 v2.3.0 // indirect github.com/openshift/api v3.9.0+incompatible // indirect github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142 // indirect github.com/openzipkin/zipkin-go v0.4.3 // indirect - github.com/outcaste-io/ristretto v0.2.1 // indirect + github.com/outcaste-io/ristretto v0.2.3 // indirect github.com/ovh/go-ovh v1.6.0 // indirect github.com/patrickmn/go-cache v2.1.0+incompatible // indirect github.com/paulmach/orb v0.11.1 // indirect @@ -483,7 +486,7 @@ require ( github.com/samber/lo v1.38.1 // indirect github.com/scaleway/scaleway-sdk-go v1.0.0-beta.29 // indirect github.com/scalyr/dataset-go v0.20.0 // indirect - github.com/secure-systems-lab/go-securesystemslib v0.7.0 // indirect + github.com/secure-systems-lab/go-securesystemslib v0.8.0 // indirect github.com/segmentio/asm v1.2.0 // indirect github.com/shirou/gopsutil/v3 v3.24.5 // indirect github.com/shirou/gopsutil/v4 v4.24.12 // indirect @@ -500,7 +503,7 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/stormcat24/protodep v0.1.8 // indirect github.com/stretchr/objx v0.5.2 // indirect - github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1086 // indirect + github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1090 // indirect github.com/tg123/go-htpasswd v1.2.3 // indirect github.com/tidwall/gjson v1.18.0 // indirect github.com/tidwall/match v1.1.1 // indirect @@ -524,75 +527,76 @@ require ( go.elastic.co/fastjson v1.4.0 // indirect go.opencensus.io v0.24.0 // indirect go.opentelemetry.io/auto/sdk v1.1.0 // indirect - go.opentelemetry.io/collector v0.118.0 // indirect - go.opentelemetry.io/collector/client v1.24.0 // indirect - go.opentelemetry.io/collector/component/componentstatus v0.118.0 // indirect - go.opentelemetry.io/collector/config/configauth v0.118.0 // indirect - go.opentelemetry.io/collector/config/configcompression v1.24.0 // indirect - go.opentelemetry.io/collector/config/configgrpc v0.118.0 // indirect - go.opentelemetry.io/collector/config/confighttp v0.118.0 // indirect - go.opentelemetry.io/collector/config/confignet v1.24.0 // indirect - go.opentelemetry.io/collector/config/configopaque v1.24.0 // indirect - go.opentelemetry.io/collector/config/configretry v1.24.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.118.0 // indirect - go.opentelemetry.io/collector/config/configtls v1.24.0 // indirect - go.opentelemetry.io/collector/connector/connectortest v0.118.0 // indirect - go.opentelemetry.io/collector/connector/xconnector v0.118.0 // indirect - go.opentelemetry.io/collector/consumer v1.24.0 // indirect - go.opentelemetry.io/collector/consumer/consumererror v0.118.0 // indirect - go.opentelemetry.io/collector/consumer/consumererror/xconsumererror v0.118.0 // indirect - go.opentelemetry.io/collector/consumer/consumertest v0.118.0 // indirect - go.opentelemetry.io/collector/consumer/xconsumer v0.118.0 // indirect - go.opentelemetry.io/collector/exporter/exporterhelper/xexporterhelper v0.118.0 // indirect - go.opentelemetry.io/collector/exporter/exportertest v0.118.0 // indirect - go.opentelemetry.io/collector/exporter/xexporter v0.118.0 // indirect - go.opentelemetry.io/collector/extension/auth v0.118.0 // indirect - go.opentelemetry.io/collector/extension/extensioncapabilities v0.118.0 // indirect - go.opentelemetry.io/collector/extension/extensiontest v0.118.0 // indirect - go.opentelemetry.io/collector/extension/xextension v0.118.0 // indirect - go.opentelemetry.io/collector/featuregate v1.24.0 // indirect - go.opentelemetry.io/collector/filter v0.118.0 // indirect - go.opentelemetry.io/collector/internal/fanoutconsumer v0.118.0 // indirect - go.opentelemetry.io/collector/internal/memorylimiter v0.118.0 // indirect - go.opentelemetry.io/collector/internal/sharedcomponent v0.118.0 // indirect - go.opentelemetry.io/collector/pdata v1.24.0 // indirect - go.opentelemetry.io/collector/pdata/pprofile v0.118.0 // indirect - go.opentelemetry.io/collector/pdata/testdata v0.118.0 // indirect - go.opentelemetry.io/collector/pipeline v0.118.0 // indirect - go.opentelemetry.io/collector/pipeline/xpipeline v0.118.0 // indirect - go.opentelemetry.io/collector/processor/processorhelper/xprocessorhelper v0.118.0 // indirect - go.opentelemetry.io/collector/processor/processortest v0.118.0 // indirect - go.opentelemetry.io/collector/processor/xprocessor v0.118.0 // indirect - go.opentelemetry.io/collector/receiver/receivertest v0.118.0 // indirect - go.opentelemetry.io/collector/receiver/xreceiver v0.118.0 // indirect - go.opentelemetry.io/collector/scraper v0.118.0 // indirect - go.opentelemetry.io/collector/scraper/scraperhelper v0.118.0 // indirect - go.opentelemetry.io/collector/semconv v0.118.0 // indirect - go.opentelemetry.io/collector/service v0.118.0 // indirect - go.opentelemetry.io/contrib/bridges/otelzap v0.6.0 // indirect - go.opentelemetry.io/contrib/config v0.10.0 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect - go.opentelemetry.io/contrib/propagators/b3 v1.31.0 // indirect - go.opentelemetry.io/contrib/zpages v0.56.0 // indirect + go.opentelemetry.io/collector v0.119.0 // indirect + go.opentelemetry.io/collector/client v1.25.0 // indirect + go.opentelemetry.io/collector/component/componentstatus v0.119.0 // indirect + go.opentelemetry.io/collector/config/configauth v0.119.0 // indirect + go.opentelemetry.io/collector/config/configcompression v1.25.0 // indirect + go.opentelemetry.io/collector/config/configgrpc v0.119.0 // indirect + go.opentelemetry.io/collector/config/confighttp v0.119.0 // indirect + go.opentelemetry.io/collector/config/confignet v1.25.0 // indirect + go.opentelemetry.io/collector/config/configopaque v1.25.0 // indirect + go.opentelemetry.io/collector/config/configretry v1.25.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.119.0 // indirect + go.opentelemetry.io/collector/config/configtls v1.25.0 // indirect + go.opentelemetry.io/collector/connector/connectortest v0.119.0 // indirect + go.opentelemetry.io/collector/connector/xconnector v0.119.0 // indirect + go.opentelemetry.io/collector/consumer v1.25.0 // indirect + go.opentelemetry.io/collector/consumer/consumererror v0.119.0 // indirect + go.opentelemetry.io/collector/consumer/consumererror/xconsumererror v0.119.0 // indirect + go.opentelemetry.io/collector/consumer/consumertest v0.119.0 // indirect + go.opentelemetry.io/collector/consumer/xconsumer v0.119.0 // indirect + go.opentelemetry.io/collector/exporter/exporterhelper/xexporterhelper v0.119.0 // indirect + go.opentelemetry.io/collector/exporter/exportertest v0.119.0 // indirect + go.opentelemetry.io/collector/exporter/xexporter v0.119.0 // indirect + go.opentelemetry.io/collector/extension/auth v0.119.0 // indirect + go.opentelemetry.io/collector/extension/extensioncapabilities v0.119.0 // indirect + go.opentelemetry.io/collector/extension/extensiontest v0.119.0 // indirect + go.opentelemetry.io/collector/extension/xextension v0.119.0 // indirect + go.opentelemetry.io/collector/featuregate v1.25.0 // indirect + go.opentelemetry.io/collector/filter v0.119.0 // indirect + go.opentelemetry.io/collector/internal/fanoutconsumer v0.119.0 // indirect + go.opentelemetry.io/collector/internal/memorylimiter v0.119.0 // indirect + go.opentelemetry.io/collector/internal/sharedcomponent v0.119.0 // indirect + go.opentelemetry.io/collector/pdata v1.25.0 // indirect + go.opentelemetry.io/collector/pdata/pprofile v0.119.0 // indirect + go.opentelemetry.io/collector/pdata/testdata v0.119.0 // indirect + go.opentelemetry.io/collector/pipeline v0.119.0 // indirect + go.opentelemetry.io/collector/pipeline/xpipeline v0.119.0 // indirect + go.opentelemetry.io/collector/processor/processorhelper/xprocessorhelper v0.119.0 // indirect + go.opentelemetry.io/collector/processor/processortest v0.119.0 // indirect + go.opentelemetry.io/collector/processor/xprocessor 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/collector/scraper v0.119.0 // indirect + go.opentelemetry.io/collector/scraper/scraperhelper v0.119.0 // indirect + go.opentelemetry.io/collector/semconv v0.119.0 // indirect + go.opentelemetry.io/collector/service v0.119.0 // indirect + go.opentelemetry.io/contrib/bridges/otelzap v0.9.0 // indirect + go.opentelemetry.io/contrib/config v0.14.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect + go.opentelemetry.io/contrib/propagators/b3 v1.34.0 // indirect + go.opentelemetry.io/contrib/zpages v0.59.0 // indirect go.opentelemetry.io/otel v1.34.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.7.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.32.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.32.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.33.0 // indirect - go.opentelemetry.io/otel/exporters/prometheus v0.55.0 // indirect - go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.7.0 // indirect - go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.32.0 // indirect - go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.33.0 // indirect - go.opentelemetry.io/otel/log v0.8.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.10.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.10.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.34.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.34.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.34.0 // indirect + go.opentelemetry.io/otel/exporters/prometheus v0.56.0 // indirect + go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.10.0 // indirect + go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.34.0 // indirect + go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.34.0 // indirect + go.opentelemetry.io/otel/log v0.10.0 // indirect go.opentelemetry.io/otel/metric v1.34.0 // indirect go.opentelemetry.io/otel/sdk v1.34.0 // indirect - go.opentelemetry.io/otel/sdk/log v0.7.0 // indirect + go.opentelemetry.io/otel/sdk/log v0.10.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.34.0 // indirect go.opentelemetry.io/otel/trace v1.34.0 // indirect - go.opentelemetry.io/proto/otlp v1.4.0 // indirect + go.opentelemetry.io/proto/otlp v1.5.0 // indirect go.uber.org/atomic v1.11.0 // indirect go.uber.org/dig v1.18.0 // indirect go.uber.org/fx v1.22.2 // indirect @@ -609,12 +613,12 @@ require ( golang.org/x/time v0.9.0 // indirect golang.org/x/tools v0.28.0 // indirect gonum.org/v1/gonum v0.15.1 // indirect - google.golang.org/api v0.216.0 // indirect - google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 // indirect + google.golang.org/api v0.219.0 // indirect + google.golang.org/genproto v0.0.0-20250106144421-5f5ef82da422 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect - google.golang.org/grpc v1.69.4 // indirect - google.golang.org/protobuf v1.36.3 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20250124145028-65684f501c47 // indirect + google.golang.org/grpc v1.70.0 // indirect + google.golang.org/protobuf v1.36.4 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect diff --git a/collector/odigosotelcol/go.sum b/collector/odigosotelcol/go.sum index daf6569616..e4556282f8 100644 --- a/collector/odigosotelcol/go.sum +++ b/collector/odigosotelcol/go.sum @@ -1,5 +1,5 @@ -cel.dev/expr v0.16.2 h1:RwRhoH17VhAu9U5CMvMhH1PDVgf0tuz9FT+24AfMLfU= -cel.dev/expr v0.16.2/go.mod h1:gXngZQMkWJoSbE8mOzehJlXQyubn/Vg0vR9/F3W7iw8= +cel.dev/expr v0.19.0 h1:lXuo+nDhpyJSpWxpPVi5cPUwzKb+dsdOiw6IreM5yt0= +cel.dev/expr v0.19.0/go.mod h1:MrpN08Q+lEBs+bGYdLxxHkZoUSsCp0nSKTs0nTymJgw= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= @@ -15,12 +15,12 @@ cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKV cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= -cloud.google.com/go v0.116.0 h1:B3fRrSDkLRt5qSHWe40ERJvhvnQwdZiHu0bJOpldweE= -cloud.google.com/go v0.116.0/go.mod h1:cEPSRWPzZEswwdr9BxE6ChEn01dWlTaF05LiC2Xs70U= -cloud.google.com/go/auth v0.13.0 h1:8Fu8TZy167JkW8Tj3q7dIkr2v4cndv41ouecJx0PAHs= -cloud.google.com/go/auth v0.13.0/go.mod h1:COOjD9gwfKNKz+IIduatIhYJQIc0mG3H102r/EMxX6Q= -cloud.google.com/go/auth/oauth2adapt v0.2.6 h1:V6a6XDu2lTwPZWOawrAa9HUK+DB2zfJyTuciBG5hFkU= -cloud.google.com/go/auth/oauth2adapt v0.2.6/go.mod h1:AlmsELtlEBnaNTL7jCj8VQFLy6mbZv0s4Q7NGBeQ5E8= +cloud.google.com/go v0.118.0 h1:tvZe1mgqRxpiVa3XlIGMiPcEUbP1gNXELgD4y/IXmeQ= +cloud.google.com/go v0.118.0/go.mod h1:zIt2pkedt/mo+DQjcT4/L3NDxzHPR29j5HcclNH+9PM= +cloud.google.com/go/auth v0.14.0 h1:A5C4dKV/Spdvxcl0ggWwWEzzP7AZMJSEIgrkngwhGYM= +cloud.google.com/go/auth v0.14.0/go.mod h1:CYsoRL1PdiDuqeQpZE0bP2pnPrGqFcOkI0nldEQis+A= +cloud.google.com/go/auth/oauth2adapt v0.2.7 h1:/Lc7xODdqcEw8IrZ9SvwnlLX6j9FHQM74z6cBk9Rw6M= +cloud.google.com/go/auth/oauth2adapt v0.2.7/go.mod h1:NTbTTzfvPl1Y3V1nPpOgl2w6d/FjO7NNUQaWSox6ZMc= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= @@ -31,14 +31,14 @@ cloud.google.com/go/compute/metadata v0.6.0 h1:A6hENjEsCDtC1k8byVsgwvVcioamEHvZ4 cloud.google.com/go/compute/metadata v0.6.0/go.mod h1:FjyFAW1MW0C203CEOMDTu3Dk1FlqW3Rga40jzHL4hfg= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= -cloud.google.com/go/iam v1.2.2 h1:ozUSofHUGf/F4tCNy/mu9tHLTaxZFLOUiKzjcgWHGIA= -cloud.google.com/go/iam v1.2.2/go.mod h1:0Ys8ccaZHdI1dEUilwzqng/6ps2YB6vRsjIe00/+6JY= -cloud.google.com/go/logging v1.12.0 h1:ex1igYcGFd4S/RZWOCU51StlIEuey5bjqwH9ZYjHibk= -cloud.google.com/go/logging v1.12.0/go.mod h1:wwYBt5HlYP1InnrtYI0wtwttpVU1rifnMT7RejksUAM= -cloud.google.com/go/longrunning v0.6.2 h1:xjDfh1pQcWPEvnfjZmwjKQEcHnpz6lHjfy7Fo0MK+hc= -cloud.google.com/go/longrunning v0.6.2/go.mod h1:k/vIs83RN4bE3YCswdXC5PFfWVILjm3hpEUlSko4PiI= -cloud.google.com/go/monitoring v1.21.2 h1:FChwVtClH19E7pJ+e0xUhJPGksctZNVOk2UhMmblmdU= -cloud.google.com/go/monitoring v1.21.2/go.mod h1:hS3pXvaG8KgWTSz+dAdyzPrGUYmi2Q+WFX8g2hqVEZU= +cloud.google.com/go/iam v1.3.1 h1:KFf8SaT71yYq+sQtRISn90Gyhyf4X8RGgeAVC8XGf3E= +cloud.google.com/go/iam v1.3.1/go.mod h1:3wMtuyT4NcbnYNPLMBzYRFiEfjKfJlLVLrisE7bwm34= +cloud.google.com/go/logging v1.13.0 h1:7j0HgAp0B94o1YRDqiqm26w4q1rDMH7XNRU34lJXHYc= +cloud.google.com/go/logging v1.13.0/go.mod h1:36CoKh6KA/M0PbhPKMq6/qety2DCAErbhXT62TuXALA= +cloud.google.com/go/longrunning v0.6.4 h1:3tyw9rO3E2XVXzSApn1gyEEnH2K9SynNQjMlBi3uHLg= +cloud.google.com/go/longrunning v0.6.4/go.mod h1:ttZpLCe6e7EXvn9OxpBRx7kZEB0efv8yBO6YnVMfhJs= +cloud.google.com/go/monitoring v1.22.1 h1:KQbnAC4IAH+5x3iWuPZT5iN9VXqKMzzOgqcYB6fqPDE= +cloud.google.com/go/monitoring v1.22.1/go.mod h1:AuZZXAoN0WWWfsSvET1Cpc4/1D8LXq8KRDU87fMS6XY= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= @@ -52,8 +52,8 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= cloud.google.com/go/storage v1.43.0 h1:CcxnSohZwizt4LCzQHWvBf1/kvtHUn7gk9QERXPyXFs= cloud.google.com/go/storage v1.43.0/go.mod h1:ajvxEa7WmZS1PxvKRq4bq0tFT3vMd502JwstCcYv0Q0= -cloud.google.com/go/trace v1.11.2 h1:4ZmaBdL8Ng/ajrgKqY5jfvzqMXbrDcBsUGXOT9aqTtI= -cloud.google.com/go/trace v1.11.2/go.mod h1:bn7OwXd4pd5rFuAnTrzBuoZ4ax2XQeG3qNgYmfCy0Io= +cloud.google.com/go/trace v1.11.3 h1:c+I4YFjxRQjvAhRmSsmjpASUKq88chOX854ied0K/pE= +cloud.google.com/go/trace v1.11.3/go.mod h1:pt7zCYiDSQjC9Y2oqCsh9jF4GStB/hmjrYLsxRR27q8= code.cloudfoundry.org/clock v0.0.0-20180518195852-02e53af36e6c h1:5eeuG0BHx1+DHeT3AP+ISKZ2ht1UjGhm581ljqYpVeQ= code.cloudfoundry.org/clock v0.0.0-20180518195852-02e53af36e6c/go.mod h1:QD9Lzhd/ux6eNQVUDVRJX/RKTigpewimNYBi7ivZKY8= dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk= @@ -125,8 +125,8 @@ github.com/ClickHouse/clickhouse-go/v2 v2.30.1 h1:Dy0n0l+cMbPXs8hFkeeWGaPKrB+MDB github.com/ClickHouse/clickhouse-go/v2 v2.30.1/go.mod h1:szk8BMoQV/NgHXZ20ZbwDyvPWmpfhRKjFkc6wzASGxM= github.com/Code-Hex/go-generics-cache v1.5.1 h1:6vhZGc5M7Y/YD8cIUcY8kcuQLB4cHR7U+0KMqAA0KcU= github.com/Code-Hex/go-generics-cache v1.5.1/go.mod h1:qxcC9kRVrct9rHeiYpFWSoW1vxyillCVzX13KZG8dl4= -github.com/DataDog/agent-payload/v5 v5.0.140 h1:JYsTcIKTWeidF11gtT4v+IRgL6y/XIKUc4MJWIMTgPE= -github.com/DataDog/agent-payload/v5 v5.0.140/go.mod h1:lxh9lb5xYrBXjblpIWYUi4deJqVbkIfkjwesi5nskDc= +github.com/DataDog/agent-payload/v5 v5.0.142 h1:HQA8VB2lbjdOtRMTUyH9WL7edxSG+wfLaGaCo4Z0V30= +github.com/DataDog/agent-payload/v5 v5.0.142/go.mod h1:lxh9lb5xYrBXjblpIWYUi4deJqVbkIfkjwesi5nskDc= github.com/DataDog/datadog-agent/comp/api/api/def v0.61.0 h1:gMvKuTE5aeXW7pHqx+2SOWmHvlyD0yQWHGBD3tUfvrk= github.com/DataDog/datadog-agent/comp/api/api/def v0.61.0/go.mod h1:Uhrn1RIKROBu1Cx/PieW+RRmd9G7LQM75d2BEA4bu9g= github.com/DataDog/datadog-agent/comp/core/config v0.61.0 h1:mm8N1LA52HMSw4OwwAmCNDwOANbDGdduhspmq/m5LLY= @@ -143,6 +143,8 @@ github.com/DataDog/datadog-agent/comp/core/log/mock v0.61.0 h1:u/0dAfkPoJ1bVZ1TS github.com/DataDog/datadog-agent/comp/core/log/mock v0.61.0/go.mod h1:6L9q/0ggudhRk3SpW2KTGftDmFG+2xpA64DZrYJDbLo= github.com/DataDog/datadog-agent/comp/core/secrets v0.61.0 h1:kfMGN5fiCax/WGz17g2P3TXN+O4ZZffIj7FvVYRJU3w= github.com/DataDog/datadog-agent/comp/core/secrets v0.61.0/go.mod h1:m8UNUeodIKWsBoAqLBgFis/g1NgLAsVc11gId70gGq4= +github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.0.0-20241217122454-175edb6c74f2 h1:dnmL5gCFYwB6dJ84nq7z17c/A4XMmCyChkVIcVars5M= +github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.0.0-20241217122454-175edb6c74f2/go.mod h1:fR7wi8IRh4M/rC4B4xbW7JE3lc2KizvGR8lsp4cf/Gk= github.com/DataDog/datadog-agent/comp/core/telemetry v0.61.0 h1:XRm+96G2uveQmRQeeCTZiwJ7LumfsiP+tXVse4i3V1w= github.com/DataDog/datadog-agent/comp/core/telemetry v0.61.0/go.mod h1:OqtdBmyPGJ3M0Kk1l+gPdOGGshUc6wT66e078q9d1MA= github.com/DataDog/datadog-agent/comp/def v0.61.0 h1:0XJNBZBw3P5Y4ndxaxwS/PZXbb+8cKSCmy+QHE8OXng= @@ -165,8 +167,8 @@ github.com/DataDog/datadog-agent/comp/trace/compression/def v0.61.0 h1:OPmk2cCWw github.com/DataDog/datadog-agent/comp/trace/compression/def v0.61.0/go.mod h1:samFXdP0HVSwD223LPLzcPKUjRQ6/uwr/1wMPo2HhRg= github.com/DataDog/datadog-agent/comp/trace/compression/impl-gzip v0.61.0 h1:0yEljJ1wF04jUgjNsIu/GZh9B0U9J/5puFOXYLPeM8o= github.com/DataDog/datadog-agent/comp/trace/compression/impl-gzip v0.61.0/go.mod h1:PxmP25AdAoNttl2qduGev+SsWCosLgc+lDyYp+Hds10= -github.com/DataDog/datadog-agent/comp/trace/compression/impl-zstd v0.61.0 h1:unNXNZQzzmbV8JCx4eASjO7L7J5zqnQKWAFXBOmlD1U= -github.com/DataDog/datadog-agent/comp/trace/compression/impl-zstd v0.61.0/go.mod h1:fE8U/oDWTC00VxnN7nZYjdZmUhLqhzT0znlyEOeITcM= +github.com/DataDog/datadog-agent/comp/trace/compression/impl-zstd v0.56.0-rc.3 h1:Hq2tQTaFcEJy9o1QFb9Ql/gm0uRzrYQkFEZGPVKLMHI= +github.com/DataDog/datadog-agent/comp/trace/compression/impl-zstd v0.56.0-rc.3/go.mod h1:TOlu5v8b46+aW9h3KLZdOiwz3gJkoQerT3+F3st6ZRA= github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.61.0 h1:M5hhncibSM4466uViSY2pEOTSxdxeOM8VGQ+4ezcFZI= github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.61.0/go.mod h1:s9QBNtoBURzy/0FeBInQ7kawNj04OnBNUo8xYr26z3E= github.com/DataDog/datadog-agent/pkg/config/env v0.61.0 h1:+dSub8UNnLmOl7YZR/7YyAgE0xNdscb86EAvW0dZqY0= @@ -211,18 +213,18 @@ github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.61.0 h1:+UjSDJiYsM2ACv github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.61.0/go.mod h1:CNXHbaYsbK6wGqlCe0oq7xPoujUvdl/GQBK1oUfxz0E= github.com/DataDog/datadog-agent/pkg/logs/util/testutils v0.61.0 h1:UurcFW+Oau4N+kzx9L+pcw+QGvpcxgfw3jt/pLC2U5w= github.com/DataDog/datadog-agent/pkg/logs/util/testutils v0.61.0/go.mod h1:CL4G7P4YqIyDmQW/otY5puTrzZwSmOG8tFxvwhu1FfE= -github.com/DataDog/datadog-agent/pkg/obfuscate v0.61.0 h1:4V7iJhRv4xh/PVpws8B1w4e/j9OX2+uEGWPT6y13ufM= -github.com/DataDog/datadog-agent/pkg/obfuscate v0.61.0/go.mod h1:uVvjVjH0bcYy30xq97t3UvDRrlfnLfvXujVtMaZW9sE= -github.com/DataDog/datadog-agent/pkg/proto v0.63.0-devel h1:lnVQk6rmjbEuhAHF85tLSjw8cD0pGb9ziFlcW9Kitic= -github.com/DataDog/datadog-agent/pkg/proto v0.63.0-devel/go.mod h1:f5zXowJhkfkMcLT82omBoPaDFuZ1iOQY5Eok2dusvfk= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.63.0-devel.0.20250123185937-1feb84b482c8 h1:EII6ZnnngX+F2kfyFgUmNAu3rXIKxY4eP58iFpyoWww= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.63.0-devel.0.20250123185937-1feb84b482c8/go.mod h1:I6QWxMjT4/bmoghhsRsbRViNIJgHK/5cOhxoeEj/1JE= +github.com/DataDog/datadog-agent/pkg/proto v0.63.0-devel.0.20250123185937-1feb84b482c8 h1:JGJekRSCOBFmoD4m+7OtP6ReUwIP9np07FJ56nD/F/0= +github.com/DataDog/datadog-agent/pkg/proto v0.63.0-devel.0.20250123185937-1feb84b482c8/go.mod h1:QOAaPRsuM4WNXtP3Rbw+gWamge9lGnDH8ZKB6HdzoAs= github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.61.0 h1:ojR8Cl+LJBmeRWjICN/8GVZh3rEbZPiQUBPn5rsVDCA= github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.61.0/go.mod h1:4EU+rg98uRkNrBYu/erOZ/GcUDd5rWT7oLNCA4dVlqg= github.com/DataDog/datadog-agent/pkg/status/health v0.61.0 h1:qMrc4qvum2GfZW1yRbIf9YKhH6i+y01ztkEu/f1nDSQ= github.com/DataDog/datadog-agent/pkg/status/health v0.61.0/go.mod h1:u7btrms/cuXnU5HAmEauHLXdsiVqUS9TfGGiYCwdpTs= github.com/DataDog/datadog-agent/pkg/telemetry v0.61.0 h1:5eqDN9YnIm1Y7TNzc+y3rLGIKA08tz2sqS8y3VqjAc0= github.com/DataDog/datadog-agent/pkg/telemetry v0.61.0/go.mod h1:6L8df1TdfYzCI0EGo0BPFgf4k2OJ19d2At96VbtTHgk= -github.com/DataDog/datadog-agent/pkg/trace v0.61.0 h1:ouQ638x3D3ZbuiVPN9l7ZhMLa4/0jNqIOvsgAXMNZrA= -github.com/DataDog/datadog-agent/pkg/trace v0.61.0/go.mod h1:ceoieLtu2s/ke83BBTlc2fg2aj0hmU7KEIO/8LgDLgk= +github.com/DataDog/datadog-agent/pkg/trace v0.64.0-devel.0.20250129182827-bab631c10d61 h1:vCSPUaK/NYjayQ7W/8jp7H/wk432GM1BlKNDSSYEnFQ= +github.com/DataDog/datadog-agent/pkg/trace v0.64.0-devel.0.20250129182827-bab631c10d61/go.mod h1:pJcvXfnlgmRtJbFRBFfR3ykl0w9Th9mM+ZwKakwGPMg= github.com/DataDog/datadog-agent/pkg/util/backoff v0.61.0 h1:VP1r5qulh6MwzcoWeMhOT197/QSY1t94U4MXLqnJM30= github.com/DataDog/datadog-agent/pkg/util/backoff v0.61.0/go.mod h1:7qKGHdQGovGp3EeuleYs6Fuh8/7J1cp2FEcObvw7ZZo= github.com/DataDog/datadog-agent/pkg/util/cgroups v0.61.0 h1:i2RyhdAma2TNMKoohQC+uXZvHODhBfx6VtMACFlfkgM= @@ -239,8 +241,8 @@ github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.61.0 h1:zC8NtbxGP github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.61.0/go.mod h1:zjoCgrVWUvgYw4lTN15TO9+sWXWYqKF8IL3fqxPRMCg= github.com/DataDog/datadog-agent/pkg/util/http v0.61.0 h1:SKkvCxmBFEgxESbDPSP2KSdJb6+6U47FIOnTJHNdQg8= github.com/DataDog/datadog-agent/pkg/util/http v0.61.0/go.mod h1:P9IRzibna2VRFEYkPqTIVK7Zihgw3IocNdoZUG4tjYQ= -github.com/DataDog/datadog-agent/pkg/util/log v0.61.0 h1:6HD4T+ZfERcc0hrpnYWtWlmqv6e9nWWu+x+iu0XtdYc= -github.com/DataDog/datadog-agent/pkg/util/log v0.61.0/go.mod h1:+pdYGRmjvO7JwubO3ayCsnHjpb6M50r5cwHM2CCtLeE= +github.com/DataDog/datadog-agent/pkg/util/log v0.63.0-devel.0.20250123185937-1feb84b482c8 h1:T7hc9Gb3IGi58fwBlfse8gpBWCyiOGWIjHThpbdb6xk= +github.com/DataDog/datadog-agent/pkg/util/log v0.63.0-devel.0.20250123185937-1feb84b482c8/go.mod h1:GIwaONyqp/4sVfcss+F32u+N+2PtR8llbwlkM5y8vbQ= github.com/DataDog/datadog-agent/pkg/util/log/setup v0.61.0 h1:gZBsUcdCueboYct3nhHNw/dRd6DooxkPEW02tpT41UQ= github.com/DataDog/datadog-agent/pkg/util/log/setup v0.61.0/go.mod h1:dI6IE10d66JWuqgsfZeSHdfQG9zyenbAnb/jEPTjf6k= github.com/DataDog/datadog-agent/pkg/util/optional v0.61.0 h1:vxor8ib6nyi5qRtbwNSI9XS7TvA7gTGLKAMcv55Ynno= @@ -270,8 +272,8 @@ github.com/DataDog/datadog-go/v5 v5.6.0 h1:2oCLxjF/4htd55piM75baflj/KoE6VYS7alEU github.com/DataDog/datadog-go/v5 v5.6.0/go.mod h1:K9kcYBlxkcPP8tvvjZZKs/m1edNAUFzBbdpTUKfCsuw= github.com/DataDog/dd-sensitive-data-scanner/sds-go/go v0.0.0-20240816154533-f7f9beb53a42 h1:RoH7VLzTnxHEugRPIgnGlxwDFszFGI7b3WZZUtWuPRM= github.com/DataDog/dd-sensitive-data-scanner/sds-go/go v0.0.0-20240816154533-f7f9beb53a42/go.mod h1:TX7CTOQ3LbQjfAi4SwqUoR5gY1zfUk7VRBDTuArjaDc= -github.com/DataDog/go-sqllexer v0.0.16 h1:RoSUMS6MECyB3gTUIdydzXwK5NhEhv6GMJkS7ptsgRA= -github.com/DataDog/go-sqllexer v0.0.16/go.mod h1:KwkYhpFEVIq+BfobkTC1vfqm4gTi65skV/DpDBXtexc= +github.com/DataDog/go-sqllexer v0.0.20 h1:0fBknHo42yuhawZS3GtuQSdqcwaiojWjYNT6OdsZRfI= +github.com/DataDog/go-sqllexer v0.0.20/go.mod h1:KwkYhpFEVIq+BfobkTC1vfqm4gTi65skV/DpDBXtexc= github.com/DataDog/go-tuf v1.1.0-0.5.2 h1:4CagiIekonLSfL8GMHRHcHudo1fQnxELS9g4tiAupQ4= github.com/DataDog/go-tuf v1.1.0-0.5.2/go.mod h1:zBcq6f654iVqmkk8n2Cx81E1JnNTMOAx1UEO/wZR+P0= github.com/DataDog/gohai v0.0.0-20230524154621-4316413895ee h1:tXibLZk3G6HncIFJKaNItsdzcrk4YqILNDZlXPTNt4k= @@ -296,18 +298,18 @@ github.com/DataDog/zstd v1.5.6 h1:LbEglqepa/ipmmQJUDnSsfvA8e8IStVcGaFWDuxvGOY= github.com/DataDog/zstd v1.5.6/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962 h1:KeNholpO2xKjgaaSyd+DyQRrsQjhbSeS7qe4nEw8aQw= github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962/go.mod h1:kC29dT1vFpj7py2OvG1khBdQpo3kInWP+6QipLbdngo= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.25.0 h1:3c8yed4lgqTt+oTQ+JNMDo+F4xprBf+O/il4ZC0nRLw= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.25.0/go.mod h1:obipzmGjfSjam60XLwGfqUkJsfiheAl+TUjG+4yzyPM= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.49.0 h1:rr2d5SF7ZftByIvSRcY0O3/d1CcJqCKUa2IM4w+jDO4= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.49.0/go.mod h1:KqGde6Vb234azF979c1vjkzDltsWQuXDlwH70UViMPg= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.49.0 h1:9pdyqZQ667if9lQn63Ju9yFc77iWT2TUWJ4rZjyBlV0= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.49.0/go.mod h1:oeyVbfp6YKpD7Ot1Gaf86cpTRHx3dhLtnCZr+s1c/ro= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.25.0 h1:4PoDbd/9/06IpwLGxSfvfNoEr9urvfkrN6mmJangGCg= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.25.0/go.mod h1:EycllQ1gupHbjqbcmfCr/H6FKSGSmEUONJ2ivb86qeY= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.49.0 h1:jJKWl98inONJAr/IZrdFQUWcwUO95DLY1XMD1ZIut+g= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.49.0/go.mod h1:l2fIqmwB+FKSfvn3bAD/0i+AXAxhIZjTK2svT/mgUXs= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.49.0 h1:GYUJLfvd++4DMuMhCFLgLXvFwofIxh/qOwoGuS/LTew= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.49.0/go.mod h1:wRbFgBQUVm1YXrvWKofAEmq9HNJTDphbAaJSSX01KUI= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.26.0 h1:f2Qw/Ehhimh5uO1fayV0QIW7DShEQqhtUfhYc+cBPlw= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.26.0/go.mod h1:2bIszWvQRlJVmJLiuLhukLImRjKPcYdzzsx6darK02A= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.50.0 h1:PxFbSFd3/VOEliGOPur2oKwypt8quKcr2RN1RE98OvI= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.50.0/go.mod h1:N99sGubvc1RDmpM0jjgO3CJUGt/4hPHonV467UCZf20= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.50.0 h1:wfHkUyYgGo6GKjm0c4S5HHOfy5v24OuPRMvrRFbNLsc= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.50.0/go.mod h1:LE1dUVKl1oD72NQ9cIW3+Y48Zv3sGxkseLaaWWnTx2E= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.26.0 h1:hlbfyLDl7kZnOrQ5yPRftT9OTQxpfpBfOqmf3y1uc2E= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.26.0/go.mod h1:ZZIZpUVreFujtCcXiAawLr9ex/FWz8uwAAzmFunV5dE= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.50.0 h1:nNMpRpnkWDAaqcpxMJvxa/Ud98gjbYwayJY4/9bdjiU= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.50.0/go.mod h1:SZiPHWGOOk3bl8tkevxkoiwPgsIl6CwrWcbwjfHZpdM= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.50.0 h1:ig/FpDD2JofP/NExKQUbn7uOSZzJAQqogfqluZK4ed4= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.50.0/go.mod h1:otE2jQekW/PqXk1Awf5lmfokJx4uwuqcj1ab5SpGeW0= github.com/IBM/sarama v1.45.0 h1:IzeBevTn809IJ/dhNKhP5mpxEXTmELuezO2tgHD9G5E= github.com/IBM/sarama v1.45.0/go.mod h1:EEay63m8EZkeumco9TDXf2JT3uDnZsZqFgV46n4yZdY= github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= @@ -363,59 +365,59 @@ github.com/aws/aws-sdk-go v1.44.263/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8 github.com/aws/aws-sdk-go v1.55.6 h1:cSg4pvZ3m8dgYcgqB97MrcdjUmZ1BeMYKUxMMB89IPk= github.com/aws/aws-sdk-go v1.55.6/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= github.com/aws/aws-sdk-go-v2 v1.18.0/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= -github.com/aws/aws-sdk-go-v2 v1.33.0 h1:Evgm4DI9imD81V0WwD+TN4DCwjUMdc94TrduMLbgZJs= -github.com/aws/aws-sdk-go-v2 v1.33.0/go.mod h1:P5WJBrYqqbWVaOxgH0X/FYYD47/nooaPOZPlQdmiN2U= -github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.7 h1:lL7IfaFzngfx0ZwUGOZdsFFnQ5uLvR0hWqqhyE7Q9M8= -github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.7/go.mod h1:QraP0UcVlQJsmHfioCrveWOC1nbiWUl3ej08h4mXWoc= +github.com/aws/aws-sdk-go-v2 v1.34.0 h1:9iyL+cjifckRGEVpRKZP3eIxVlL06Qk1Tk13vreaVQU= +github.com/aws/aws-sdk-go-v2 v1.34.0/go.mod h1:JgstGg0JjWU1KpVJjD5H0y0yyAIpSdKEq556EI6yOOM= +github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.8 h1:zAxi9p3wsZMIaVCdoiQp2uZ9k1LsZvmAnoTBeZPXom0= +github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.8/go.mod h1:3XkePX5dSaxveLAYY7nsbsZZrKxCyEuE5pM4ziFxyGg= github.com/aws/aws-sdk-go-v2/config v1.18.25/go.mod h1:dZnYpD5wTW/dQF0rRNLVypB396zWCcPiBIvdvSWHEg4= -github.com/aws/aws-sdk-go-v2/config v1.29.1 h1:JZhGawAyZ/EuJeBtbQYnaoftczcb2drR2Iq36Wgz4sQ= -github.com/aws/aws-sdk-go-v2/config v1.29.1/go.mod h1:7bR2YD5euaxBhzt2y/oDkt3uNRb6tjFp98GlTFueRwk= +github.com/aws/aws-sdk-go-v2/config v1.29.2 h1:JuIxOEPcSKpMB0J+khMjznG9LIhIBdmqNiEcPclnwqc= +github.com/aws/aws-sdk-go-v2/config v1.29.2/go.mod h1:HktTHregOZwNSM/e7WTfVSu9RCX+3eOv+6ij27PtaYs= github.com/aws/aws-sdk-go-v2/credentials v1.13.24/go.mod h1:jYPYi99wUOPIFi0rhiOvXeSEReVOzBqFNOX5bXYoG2o= -github.com/aws/aws-sdk-go-v2/credentials v1.17.54 h1:4UmqeOqJPvdvASZWrKlhzpRahAulBfyTJQUaYy4+hEI= -github.com/aws/aws-sdk-go-v2/credentials v1.17.54/go.mod h1:RTdfo0P0hbbTxIhmQrOsC/PquBZGabEPnCaxxKRPSnI= +github.com/aws/aws-sdk-go-v2/credentials v1.17.55 h1:CDhKnDEaGkLA5ZszV/qw5uwN5M8rbv9Cl0JRN+PRsaM= +github.com/aws/aws-sdk-go-v2/credentials v1.17.55/go.mod h1:kPD/vj+RB5MREDUky376+zdnjZpR+WgdBBvwrmnlmKE= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.3/go.mod h1:4Q0UFP0YJf0NrsEuEYHpM9fTSEVnD16Z3uyEF7J9JGM= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.24 h1:5grmdTdMsovn9kPZPI23Hhvp0ZyNm5cRO+IZFIYiAfw= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.24/go.mod h1:zqi7TVKTswH3Ozq28PkmBmgzG1tona7mo9G2IJg4Cis= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.52 h1:6kI83R98XOnnyzHv9g9KTYXFawMyeQq8NeEERWMAwJk= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.52/go.mod h1:Juj7unpf3CIrWpEyJZhRJ6rJl9IYX7Hd8HOlwaZq/LE= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.25 h1:kU7tmXNaJ07LsyN3BUgGqAmVmQtq0w6duVIHAKfp0/w= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.25/go.mod h1:OiC8+OiqrURb1wrwmr/UbOVLFSWEGxjinj5C299VQdo= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.54 h1:6BWOAho3Cgdy4cmNJ4HWY8VZgqODEU7Gw78XXireNZI= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.54/go.mod h1:n+t/oyYErOV3jf/GxNTVlizSM9RMV1yH7jvcIvld3Do= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33/go.mod h1:7i0PF1ME/2eUPFcjkVIwq+DOygHEoK92t5cDqNgYbIw= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.28 h1:igORFSiH3bfq4lxKFkTSYDhJEUCYo6C8VKiWJjYwQuQ= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.28/go.mod h1:3So8EA/aAYm36L7XIvCVwLa0s5N0P7o2b1oqnx/2R4g= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.29 h1:Ej0Rf3GMv50Qh4G4852j2djtoDb7AzQ7MuQeFHa3D70= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.29/go.mod h1:oeNTC7PwJNoM5AznVr23wxhLnuJv0ZDe5v7w0wqIs9M= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.27/go.mod h1:UrHnn3QV/d0pBZ6QBAEQcqFLf8FAzLmoUfPVIueOvoM= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.28 h1:1mOW9zAUMhTSrMDssEHS/ajx8JcAj/IcftzcmNlmVLI= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.28/go.mod h1:kGlXVIWDfvt2Ox5zEaNglmq0hXPHgQFNMix33Tw22jA= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.29 h1:6e8a71X+9GfghragVevC5bZqvATtc3mAMgxpSNbgzF0= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.29/go.mod h1:c4jkZiQ+BWpNqq7VtrxjwISrLrt/VvPq3XiopkUIolI= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.34/go.mod h1:Etz2dj6UHYuw+Xw830KfzCfWGMzqvUTCjUj5b76GVDc= -github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 h1:VaRN3TlFdd6KxX1x3ILT5ynH6HvKgqdiXoTxAF4HQcQ= -github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1/go.mod h1:FbtygfRFze9usAadmnGJNc8KsP346kEe+y2/oyhGAGc= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.28 h1:7kpeALOUeThs2kEjlAxlADAVfxKmkYAedlpZ3kdoSJ4= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.28/go.mod h1:pyaOYEdp1MJWgtXLy6q80r3DhsVdOIOZNB9hdTcJIvI= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.200.0 h1:3hH6o7Z2WeE1twvz44Aitn6Qz8DZN3Dh5IB4Eh2xq7s= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.200.0/go.mod h1:I76S7jN0nfsYTBtuTgTsJtK2Q8yJVDgrLr5eLN64wMA= -github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1 h1:iXtILhvDxB6kPvEXgsDhGaZCSC6LQET5ZHSdJozeI0Y= -github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1/go.mod h1:9nu0fVANtYiAePIBh2/pFUSwtJ402hLnp854CNoDOeE= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.5.2 h1:e6um6+DWYQP1XCa+E9YVtG/9v1qk5lyAOelMOVwSyO8= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.5.2/go.mod h1:dIW8puxSbYLSPv/ju0d9A3CpwXdtqvJtYKDMVmPLOWE= +github.com/aws/aws-sdk-go-v2/internal/ini v1.8.2 h1:Pg9URiobXy85kgFev3og2CuOZ8JZUBENF+dcgWBaYNk= +github.com/aws/aws-sdk-go-v2/internal/ini v1.8.2/go.mod h1:FbtygfRFze9usAadmnGJNc8KsP346kEe+y2/oyhGAGc= +github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.29 h1:g9OUETuxA8i/Www5Cby0R3WSTe7ppFTZXHVLNskNS4w= +github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.29/go.mod h1:CQk+koLR1QeY1+vm7lqNfFii07DEderKq6T3F1L2pyc= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.202.0 h1:/kB9Uf7fgpYNLvwhAW0YiDSg7xQyxB6MbEYoC0yXtjs= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.202.0/go.mod h1:cRD0Fhzj0YD+uAh16NChQAv9/BB0S9x3YK9hLx1jb/k= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.2 h1:D4oz8/CzT9bAEYtVhSBmFj2dNOtaHOtMKc2vHBwYizA= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.2/go.mod h1:Za3IHqTQ+yNcRHxu1OFucBh0ACZT4j4VQFF0BqpZcLY= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.5.3 h1:EP1ITDgYVPM2dL1bBBntJ7AW5yTjuWGz9XO+CZwpALU= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.5.3/go.mod h1:5lWNWeAgWenJ/BZ/CP9k9DjLbC0pjnM045WjXRPPi14= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.27/go.mod h1:EOwBD4J4S5qYszS5/3DpkejfuK+Z5/1uzICfPaZLtqw= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.9 h1:TQmKDyETFGiXVhZfQ/I0cCFziqqX58pi4tKJGYGFSz0= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.9/go.mod h1:HVLPK2iHQBUx7HfZeOQSEu3v2ubZaAY2YPbAm5/WUyY= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.9 h1:2aInXbh02XsbO0KobPGMNXyv2QP73VDKsWPNJARj/+4= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.9/go.mod h1:dgXS1i+HgWnYkPXqNoPIPKeUsUUYHaUbThC90aDnNiE= -github.com/aws/aws-sdk-go-v2/service/s3 v1.73.2 h1:F3h8VYq9ZLBXYurmwrT8W0SPhgCcU0q+0WZJfT1dFt0= -github.com/aws/aws-sdk-go-v2/service/s3 v1.73.2/go.mod h1:jGJ/v7FIi7Ys9t54tmEFnrxuaWeJLpwNgKp2DXAVhOU= -github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.34.6 h1:T0de0qF54Pz6bHQ6vneVuppG+ag1GC9x2FWVvN7WQZk= -github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.34.6/go.mod h1:xhlurTl19sqUqQceQdrQ9sNCgPBCBrlGWrzS/0GFwhY= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.10 h1:hN4yJBGswmFTOVYqmbz1GBs9ZMtQe8SrYxPwrkrlRv8= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.10/go.mod h1:TsxON4fEZXyrKY+D+3d2gSTyJkGORexIYab9PTf56DA= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.10 h1:fXoWC2gi7tdJYNTPnnlSGzEVwewUchOi8xVq/dkg8Qs= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.10/go.mod h1:cvzBApD5dVazHU8C2rbBQzzzsKc8m5+wNJ9mCRZLKPc= +github.com/aws/aws-sdk-go-v2/service/s3 v1.74.1 h1:9LawY3cDJ3HE+v2GMd5SOkNLDwgN4K7TsCjyVBYu/L4= +github.com/aws/aws-sdk-go-v2/service/s3 v1.74.1/go.mod h1:hHnELVnIHltd8EOF3YzahVX6F6y2C6dNqpRj1IMkS5I= +github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.34.7 h1:K60+ojzkvi7jU7yRCtpgm1Gx5D/E7qrKgAQR9EqhrNw= +github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.34.7/go.mod h1:bX7qK97+Qvod+LUaU029kI1oYp5FLPom8warSCcXxc8= github.com/aws/aws-sdk-go-v2/service/sso v1.12.10/go.mod h1:ouy2P4z6sJN70fR3ka3wD3Ro3KezSxU6eKGQI2+2fjI= -github.com/aws/aws-sdk-go-v2/service/sso v1.24.11 h1:kuIyu4fTT38Kj7YCC7ouNbVZSSpqkZ+LzIfhCr6Dg+I= -github.com/aws/aws-sdk-go-v2/service/sso v1.24.11/go.mod h1:Ro744S4fKiCCuZECXgOi760TiYylUM8ZBf6OGiZzJtY= +github.com/aws/aws-sdk-go-v2/service/sso v1.24.12 h1:kznaW4f81mNMlREkU9w3jUuJvU5g/KsqDV43ab7Rp6s= +github.com/aws/aws-sdk-go-v2/service/sso v1.24.12/go.mod h1:bZy9r8e0/s0P7BSDHgMLXK2KvdyRRBIQ2blKlvLt0IU= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.10/go.mod h1:AFvkxc8xfBe8XA+5St5XIHHrQQtkxqrRincx4hmMHOk= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.10 h1:l+dgv/64iVlQ3WsBbnn+JSbkj01jIi+SM0wYsj3y/hY= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.10/go.mod h1:Fzsj6lZEb8AkTE5S68OhcbBqeWPsR8RnGuKPr8Todl8= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.11 h1:mUwIpAvILeKFnRx4h1dEgGEFGuV8KJ3pEScZWVFYuZA= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.11/go.mod h1:JDJtD+b8HNVv71axz8+S5492KM8wTzHRFpMKQbPlYxw= github.com/aws/aws-sdk-go-v2/service/sts v1.19.0/go.mod h1:BgQOMsg8av8jset59jelyPW7NoZcZXLVpDsXunGDrk8= -github.com/aws/aws-sdk-go-v2/service/sts v1.33.9 h1:BRVDbewN6VZcwr+FBOszDKvYeXY1kJ+GGMCcpghlw0U= -github.com/aws/aws-sdk-go-v2/service/sts v1.33.9/go.mod h1:f6vjfZER1M17Fokn0IzssOTMT2N8ZSq+7jnNF0tArvw= +github.com/aws/aws-sdk-go-v2/service/sts v1.33.10 h1:g9d+TOsu3ac7SgmY2dUf1qMgu/uJVTlQ4VCbH6hRxSw= +github.com/aws/aws-sdk-go-v2/service/sts v1.33.10/go.mod h1:WZfNmntu92HO44MVZAubQaz3qCuIdeOdog2sADfU6hU= github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= -github.com/aws/smithy-go v1.22.1 h1:/HPHZQ0g7f4eUeK6HKglFz8uwVfZKgoI25rb/J+dnro= -github.com/aws/smithy-go v1.22.1/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg= +github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ= +github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg= github.com/bboreham/go-loser v0.0.0-20230920113527-fcc2c21820a3 h1:6df1vn4bBlDDo4tARvBm7l6KA9iVMnE3NWizDeWSrps= github.com/bboreham/go-loser v0.0.0-20230920113527-fcc2c21820a3/go.mod h1:CIWtjkly68+yqLPbvwwR/fjNJA/idrtULjZWh2v1ys0= github.com/benbjohnson/clock v1.3.5 h1:VvXlSJBzZpA/zum6Sj74hxwYI2DIxRWuNIoXAzHZz5o= @@ -429,8 +431,8 @@ github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932 h1:mXoPYz/Ul5HYE github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932/go.mod h1:NOuUCSz6Q9T7+igc/hlvDOUdtWKryOrtFyIVABv/p7k= github.com/bits-and-blooms/bitset v1.4.0 h1:+YZ8ePm+He2pU3dZlIZiOeAKfrBkXi1lSrXJ/Xzgbu8= github.com/bits-and-blooms/bitset v1.4.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA= -github.com/bmatcuk/doublestar/v4 v4.8.0 h1:DSXtrypQddoug1459viM9X9D3dp1Z7993fw36I2kNcQ= -github.com/bmatcuk/doublestar/v4 v4.8.0/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc= +github.com/bmatcuk/doublestar/v4 v4.8.1 h1:54Bopc5c2cAvhLRAzqOGCYHYyhcDHsFF4wWIR5wKP38= +github.com/bmatcuk/doublestar/v4 v4.8.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc= github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY= github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= github.com/briandowns/spinner v1.23.0 h1:alDF2guRWqa/FOZZYWjlMIx2L6H0wyewPxo/CH4Pt2A= @@ -458,8 +460,8 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 h1:QVw89YDxXxEe+l8gU8ETbOasdwEV+avkR75ZzsVV9WI= github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78/go.mod h1:W+zGtBO5Y1IgJhy4+A9GOqVhqLpfZi+vwmdNXUehLA8= -github.com/containerd/cgroups/v3 v3.0.3 h1:S5ByHZ/h9PMe5IOQoN7E+nMc2UcLEM/V48DGDJ9kip0= -github.com/containerd/cgroups/v3 v3.0.3/go.mod h1:8HBe7V3aWGLFPd/k03swSIsGjZhHI2WzJmticMgVuz0= +github.com/containerd/cgroups/v3 v3.0.5 h1:44na7Ud+VwyE7LIoJ8JTNQOa549a8543BmzaJHo6Bzo= +github.com/containerd/cgroups/v3 v3.0.5/go.mod h1:SA5DLYnXO8pTGYiAHXz94qvLQTKfVM5GEVisn4jpins= github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I= github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo= github.com/containerd/platforms v0.2.1 h1:zvwtM3rz2YHPQsF2CHYM8+KtB5dvhISiXh5ZpSBQv6A= @@ -499,8 +501,8 @@ github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5Qvfr github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI= github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ= -github.com/docker/docker v27.5.0+incompatible h1:um++2NcQtGRTz5eEgO6aJimo6/JxrTXC941hd05JO6U= -github.com/docker/docker v27.5.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v27.5.1+incompatible h1:4PYU5dnBYqRQi0294d1FBECqT9ECWeQAIfE8q4YnPY8= +github.com/docker/docker v27.5.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= @@ -639,15 +641,15 @@ github.com/go-zookeeper/zk v1.0.3 h1:7M2kwOsc//9VeeFiPtf+uSJlVpU66x9Ba5+8XK7/TDg github.com/go-zookeeper/zk v1.0.3/go.mod h1:nOB03cncLtlp4t+UAkGSV+9beXP/akpekBwL+UX1Qcw= github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= -github.com/goccy/go-json v0.10.4 h1:JSwxQzIqKfmFX1swYPpUThQZp/Ka4wzJdK0LWVytLPM= -github.com/goccy/go-json v0.10.4/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= +github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4= +github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= github.com/gocql/gocql v1.7.0 h1:O+7U7/1gSN7QTEAaMEsJc1Oq2QHXvCWoF3DFK9HDHus= github.com/gocql/gocql v1.7.0/go.mod h1:vnlvXyFZeLBF0Wy+RS8hrOdbn0UWsWtdg07XJnFxZ+4= github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 h1:ZpnhV/YsD2/4cESfV5+Hoeu/iUR3ruzNvZ+yQfO03a0= github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/godbus/dbus/v5 v5.0.6 h1:mkgN1ofwASrYnJ5W6U/BxG15eXXXjirgZc7CLqkcaro= -github.com/godbus/dbus/v5 v5.0.6/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk= +github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gofrs/uuid v3.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gofrs/uuid v4.4.0+incompatible h1:3qXRTX8/NbyulANqlc0lchS1gqAVxRgsuW1YrTJupqA= github.com/gofrs/uuid v4.4.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= @@ -677,8 +679,9 @@ github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= -github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= +github.com/golang/mock v1.7.0-rc.1 h1:YojYx61/OLFsiv6Rw1Z96LpldJIy31o+UHmwAUMJ6/U= +github.com/golang/mock v1.7.0-rc.1/go.mod h1:s42URUywIqd+OcERslBJvOjepvNymP31m3q8d/GkuRs= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -743,8 +746,8 @@ github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20240711041743-f6c9dda6c6da h1:xRmpO92tb8y+Z85iUOMOicpCfaYcv7o3Cg3wKrIpg8g= github.com/google/pprof v0.0.0-20240711041743-f6c9dda6c6da/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/s2a-go v0.1.8 h1:zZDs9gcbt9ZPLV0ndSyQk6Kacx2g/X+SKYovpnz3SMM= -github.com/google/s2a-go v0.1.8/go.mod h1:6iNWHTpQ+nfNRN5E00MSdfDwVesa8hhS32PhPO8deJA= +github.com/google/s2a-go v0.1.9 h1:LGD7gtMgezd8a/Xak7mEWL0PjoTQFvpRudN895yqKW0= +github.com/google/s2a-go v0.1.9/go.mod h1:YA0Ei2ZQL3acow2O62kdp9UlnvMmU7kA6Eutn0dXayM= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= @@ -1071,232 +1074,234 @@ github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1Cpa github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0= -github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.118.0 h1:ZApYkbwUbMXusZzxUNO3/aM2W8JGwgzzH0qdpB+pRV8= -github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.118.0/go.mod h1:KOFbbwKrlkZ9g1oZp9YrEbLbKrNGYBc2LZFZD2JGO8Y= -github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.118.0 h1:i6EXJvoGNOrYvmYbOgJu2FRurpMg1eS/lP6nkEOwKM8= -github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.118.0/go.mod h1:I96MagdAxY3SNR8PZWSiKMp4s8EfutqmhJVpQ3x4dLk= -github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector v0.118.0 h1:m9UqAqJ6sUPlOQQnttgVn29ZEmuAUwLGCgHbkTAPAC8= -github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector v0.118.0/go.mod h1:tdHtyQiwsWlDMqlcE2+oPbVC6tvvrXEe8Oqj7eg2G5k= -github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector v0.118.0 h1:rgCjwhoBxE7ElStPeREdQPJmQSqL0fUwbJY74wA2G+M= -github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector v0.118.0/go.mod h1:bD4ARsuDxfqEGQWpPHB2XWFEE769bDlYJOYaUgfmcg4= -github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.118.0 h1:d54ouFAQsI/qdFIq2ATvMsWtOXR4tYv7DWr0NVQhsbo= -github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.118.0/go.mod h1:VXU7H8cF8ZpISps8JUdhb3W/ZjsEOKANaY8SZJiSkXo= -github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.118.0 h1:X0RNsPCvo+VCQNaxFL+3Zj+13/It8aY6yRmBSLcGy1c= -github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.118.0/go.mod h1:ZZzyaYuuQVUA/STahm8GOJqXRPFrB9KxT7jY7EakDXA= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awss3exporter v0.118.0 h1:onPWhc4sgzdYFJa1RLVw6fGgf+c/rzU0XszjmLhaqkw= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awss3exporter v0.118.0/go.mod h1://W1J2ZDpaE0XSI+vRtruiEBh2Jr6FzKgw+adM0rrr4= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.118.0 h1:czF3Wu77A9YOJEeOZ98aq9fnMv3rI/a+r606HcTAf8Q= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.118.0/go.mod h1:detShU56yjWfCJ9Z7h1+YW3oFu76leAoNVhXx/wlHqg= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azuredataexplorerexporter v0.118.0 h1:Q1Ww3RMGDuGzsYDG6oeEOxflIXU6TMEiDZqgnNX5580= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azuredataexplorerexporter v0.118.0/go.mod h1:pey11VzBoQEOWyquxdO3DH5AXfl+h49tmS6WKxHu0/Q= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azuremonitorexporter v0.118.0 h1:zMxdqs4Hx4pDIj8hK9B529Z7AR7ge8HEQrmEaQLbzW0= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azuremonitorexporter v0.118.0/go.mod h1:qrNqpSodpf1aq9JtN/9nFyn+DKBAqeq81z5uSa2wk8Y= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter v0.118.0 h1:lOm9kdLj2g/7v2VE/MdIZKpgYbnPgX3cBOdAUm+8Ulo= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter v0.118.0/go.mod h1:ky14gD4IGrRjocvajWILaJDNvk79JLP7Ld0X4qLj33Q= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/cassandraexporter v0.118.0 h1:f0R0vGDhlnIz5SNRbqNQDUm0FiX8xZFe7L/eo897Tf8= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/cassandraexporter v0.118.0/go.mod h1:g5gWRV38sumnBa37uIhm1jdJmEWSO/KLuEz5VBbb3rQ= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/clickhouseexporter v0.118.0 h1:bhuGiU64BbKHHrc8jr1IUAvHe/8ldqb/22abDyokoUo= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/clickhouseexporter v0.118.0/go.mod h1:I5kvPAbbbphZZB7XbwmGeTrrsn3urkmdAf7iPLklUco= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/coralogixexporter v0.118.0 h1:fSSVjnoWHxqr0rUiR2mYwY1P9YgGoTw/aNY0AYGN1GU= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/coralogixexporter v0.118.0/go.mod h1:/TyjN9UN316AkqJpRY9sFpjEajbwcTglIe8h2xvNSTw= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.118.0 h1:AsPP531/BHxHh0SD73ij1Lg+prrGn2RTVXWdtf0d0YI= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.118.0/go.mod h1:NKFEb3yh4hZBTi1BQM5Sn7n/UiIVBZForHHqjtJBH5U= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datasetexporter v0.118.0 h1:WSvdC29MNUKy6ObaqK8xTS1OdCpMu1viQs9bKoEX1S8= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datasetexporter v0.118.0/go.mod h1:5X+GPNiSqXszTXGFLXEYpVl1L+hpCPn3Ibp3TzEzRQk= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter v0.118.0 h1:iFYdYPNUkGrSSqdeKB/F6v9WgIGR44RuKTzVi+lutMM= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter v0.118.0/go.mod h1:bxoNXfsXSXxsW1+/lw87VJZGbyl3YIVHeABqlK0XAew= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.118.0 h1:+Gz6fS3RaBnDc+LlYtFx9qTd8pBaWuhZXE472tIufwI= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.118.0/go.mod h1:DdBqZpkmqdIiJD4fU9yMOJ1kT287/3isM+z4y7vTqb4= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudexporter v0.118.0 h1:NTw/0BO81ZlBy28ZOEElrN11mtgYs9RbLMrF35S9iGE= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudexporter v0.118.0/go.mod h1:oCkQIlzyL4mSDDA5Ng6v8Yfa0aDLU296IEQ54JaFqrY= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudpubsubexporter v0.118.0 h1:INl/qFL8zYBbSvRIEiJuctLXJwK4XVWNrzr+gmCQq7w= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudpubsubexporter v0.118.0/go.mod h1:qM/6enwAQyQieg/IWdXyP4MOilpXal0FwRAJ8d35YKo= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlemanagedprometheusexporter v0.118.0 h1:qAcXQ1g5bN0ftLFX1gf7/No31lQoxLyFc4j//QpydTY= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlemanagedprometheusexporter v0.118.0/go.mod h1:dCK1272IIiiSG8o3pcRliYWE2aW+jr1M/Jdk8rWutDk= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/honeycombmarkerexporter v0.118.0 h1:uHKzciPPzvwF8ibxo+rqh8brzuPoiBE20Ltuv9P1laQ= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/honeycombmarkerexporter v0.118.0/go.mod h1:5RWfwrtvZy/1DqvOMUhd9N0kXsvEvYHTJ7qN5LJaKEc= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter v0.118.0 h1:vVrHVicGYrh5+696qH5orgOLvmROCFPEVnR6THXzdS8= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter v0.118.0/go.mod h1:FkGp25BcA7K5B+6S3qV3OiUubtassWkccvBt6fYSeH4= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.118.0 h1:GKIdx0Ug1IpcBiOA28BvCxZo4GIGsQR1dW6Id3aFYVE= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.118.0/go.mod h1:Ya3cB0ep9+pSkPD6W6lB1xaUVBicQt3xVyITKBjd3sw= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter v0.118.0 h1:VB8BPjYIwYT7GOpsthrqOGuy9ru/cyjePzpD0lzDzIs= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter v0.118.0/go.mod h1:XvJtfGrOd8bZWn2AJ5pNiZb2eSB6lUxnc+vjlPiLC2E= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/logicmonitorexporter v0.118.0 h1:msqtwTEWzslaSJzWg7tJUH5EEIYbyjF9i0BWqx2vrpM= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/logicmonitorexporter v0.118.0/go.mod h1:OO6aXQHiLSF9YqGNkXVMZww23C5J4sBP/FXi90NztM0= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/logzioexporter v0.118.0 h1:s5mGghaUtbA/ECmvYb+H9Tr5uePgoGkRr/wIEoPTV6g= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/logzioexporter v0.118.0/go.mod h1:yNCibEirE+74aYbGSF4TiF8as4ub3sHzQfwmfURqqqk= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/lokiexporter v0.118.0 h1:zQSlCA9Rwrx1KW+/+1EfEgVvCjlfQ10rcSJ8+JvVDiA= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/lokiexporter v0.118.0/go.mod h1:l55qZBOvbxNhg7LfVNeD2qyAAua/ruUyaNkrfkI6eds= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/mezmoexporter v0.118.0 h1:P9UIaFRpkcuIoE9BYC+vdbiC1N/evqlC+56Yi373vPs= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/mezmoexporter v0.118.0/go.mod h1:WtpQgifR7LiihAWOPTiNaBKIstjNifnDdMJ+Hl5AnPc= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opencensusexporter v0.118.0 h1:XRcj+GpG/+igE4U4By9CvAM34ZdwPdbPway7vEA9AIA= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opencensusexporter v0.118.0/go.mod h1:nnJ5guoHAZysVII22+qcwbDSmewyKVswm+XLDdM3Q5Y= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opensearchexporter v0.118.0 h1:JL+iSvb0+ATqOhI4Rdxq5S33EVs5VXLdo+FiGe/T9+c= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opensearchexporter v0.118.0/go.mod h1:b9yUuIRcOjr2qVNXFtd7xwcoGltl31gAUATcYGODGug= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.118.0 h1:6kRNGoY0sr3O7pVNu2jre+Lge5AsOTQneONRpSOc5UU= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.118.0/go.mod h1:SWz+S+h0kxcWnh1YON8O75sPJNA6BSOpmsxss9M7bGI= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.118.0 h1:zHA9n518dSAz2VKqqn30upcZQL6ll9lrK1jCRnBHmhc= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.118.0/go.mod h1:9KW4qWtwCvpWmZYczNkwCwT7nI2Nat6IemDX5w/fTdI= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/pulsarexporter v0.118.0 h1:lXjmPqN54LZYV+OxyQaNq6Dj1Ovue/H9/yR8b89SkPI= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/pulsarexporter v0.118.0/go.mod h1:ARhyOvo3+8LL6H0gGLFUO+OH33rL2f4YnfWJI++NdYI= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.118.0 h1:3ppMguebAQUpaf7vy8fbgnPNBTXRMUPzMy1qvzkG8lw= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.118.0/go.mod h1:zhFt+3GJXpvmSlNp8XnnR4kIIgsKfTBIlLXoH1SPMHY= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sentryexporter v0.118.0 h1:MMYbRu9amsQA5zu8djpfcgBh99MpZLxd34iZczjtkwA= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sentryexporter v0.118.0/go.mod h1:h5ov3XWRxArxzk5M8kBpinC7Z3jIVshQY+Gup+qVOgA= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.118.0 h1:ml1G+WzE8RR9DbnODGBzYWzuajDj4Se2D+UC23T2ip4= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.118.0/go.mod h1:5GtCdm9vK2EW7dKaPZHZkmC43gErJZ5yZFTQrMYbnlc= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.118.0 h1:rhc4NLMsakb4YCgki1HTzfxDswc+WZE7kK7TXG814DM= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.118.0/go.mod h1:4SswyJlrZBWFg0X5X15CgHgPQx2MVmSK3WTApV2VDzA= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sumologicexporter v0.118.0 h1:i0AQqyVKXhB1hT9R9gOUyMkoHiDOvpEolXHtdVkTo4s= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sumologicexporter v0.118.0/go.mod h1:23UelUj/+U6WOrGTPsAzJp6ohajk8dDUBAgCQdNvrPk= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/syslogexporter v0.118.0 h1:m7HZIxYqOw8KPZC1ze6722uDbxGnLJHHmkOpuI9vfQs= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/syslogexporter v0.118.0/go.mod h1:WQR4tmBA39DNwhIZFNj2PmVGs2iaulascVNegDZdhtE= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/tencentcloudlogserviceexporter v0.118.0 h1:L3nLNThiwb5sESHQTWK8nfwhclZkCBKtTvNL26X2A0A= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/tencentcloudlogserviceexporter v0.118.0/go.mod h1:DI93eoQ4zEVtRfBvWugm8akXpxdIhExJDrAYG6sSp7Q= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.118.0 h1:2nY0HZ2mvPhTIcC3qNcZdAvjgurGA+h09As42iQdgW8= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.118.0/go.mod h1:nEVT4t0anoejKqdFIznHJ/nOWwxnu2HCi4c+OeVE6T4= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.118.0 h1:eUQRSn3xvFuf4+xdrl4KjwrZoX/9FUSWLsHAKUOdmR0= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.118.0/go.mod h1:/3krBm/kclLdMz1Hk+ZYHx6kC8v/9SnGulg64uWcdFU= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding v0.118.0 h1:T2fLgsTwY+JQ617BeKMgjdIQv2+TOdZ/xVmEyOTxfJY= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding v0.118.0/go.mod h1:F2xCwH8jCVDPSfVPr9ufdT3U7jXgJ51xP6J2dsUSmAY= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/otlpencodingextension v0.118.0 h1:menfupEancURMvixTcm1/0YjnJY8vEkTaIb2kW38Exk= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/otlpencodingextension v0.118.0/go.mod h1:AliqOt9jU5u2jV+9+uQCE/8gDfhLw+IY3LQgPZW+d6k= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.118.0 h1:HKPTwhA+GNlsBpIR77DH1gwbzL2thOv/+rZzEZ27Sdk= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.118.0/go.mod h1:MchgZvCCgNc9sXj52bvrjQQxS71UaZ0HcikwUDuGwFg= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.118.0 h1:KlIEiJprSJYUvc2XxXCu0uXM0/T/IbTKcyugEcjmnm4= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.118.0/go.mod h1:oE1OPZITVJobOfQBHokvUlCm4BILngcmba1jkKhBcKs= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.118.0 h1:uWMYM1UrkVGBlWDZP5DxrjVvGfKM3RUaEwSeBNaW8aU= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.118.0/go.mod h1:cBXc0E/8KWMwd5CZfg2PrOeSRzeE9+uL/P02ZV86fV0= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/sumologicextension v0.118.0 h1:QHKmssgic6zf39mt0xyJ/FIZ8wTkKY2kWyN6TxV8jxw= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/sumologicextension v0.118.0/go.mod h1:Dr+J6SsDlfodti2mFCPtCg7dJk0iq8+YmFrUUEfGVrU= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.118.0 h1:aOwaGk7aKjfzZm3NCZbN+UnZCzGeVQ2q3BiekNN5YJE= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.118.0/go.mod h1:cN2XY980uuIPD1ZOyjDbMzxWLoHBufZqRKWeEx/LugU= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.118.0 h1:xRe7n6OGxrjAkSycWEHSRXlSO9gN8dHoRHC8mrNEqsU= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.118.0/go.mod h1:6Lrr+9tQ1/cBVpMhccQ43CgUmy9YYbsu/yssNIZJxjM= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.118.0 h1:MfTOWZTPNA1hW+7tA+X9Y08MNBuGiHp0uLjcVSvSTLs= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.118.0/go.mod h1:pQ1QSCaChErLo59nmR0swgwf3smOu7fBjgESF4bNJnQ= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.118.0 h1:W6maz9dZiAYO3WWFMy41GoX2tzx7EPiLGiykNkiAOMI= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.118.0/go.mod h1:WmS8hAnghKAR5UGYC/sww46mKkBO4RxAqkn8K0i+ZU4= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.118.0 h1:Xnwd0QEyBg6iNPUbc3CnHIb0hVjfTc+jHdFbA9VSa7k= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.118.0/go.mod h1:rmqCuNFMNBUxgyufeU8rpVYOWau8ubr0gmSO1u+R5Hk= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.118.0 h1:ID+tXs48HrBgG8FqRbBxTBTssybnBc7M7+dcY4dD5Bg= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.118.0/go.mod h1:VHzkkLUJmRxbIYdbIv/8ZkaDmpMNbtJydMgbEp61GrE= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/metrics v0.118.0 h1:PbknCwTbeTz8GNSfN4fOIp50YCDO19s1IAp6PGFcdpA= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/metrics v0.118.0/go.mod h1:cOY+YDFtxJH3eQzJDObvWFFSIvD2AstG5MZ9t8wqusQ= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.118.0 h1:cRDOmJfEOm7G369Lw47k03NIg1qY6HtO9XTwfYRLBw4= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.118.0/go.mod h1:KPphlnKqOx44kbEks3VjqQstD/892osXDVN1kn53wWE= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.118.0 h1:94Xf/jV2ewqnVRA/CUKvNKZ5p3+mEtrMcPE1Xw9lk18= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.118.0/go.mod h1:GhC+Pk3PbAIq52vmYr+d6PN4Hnxyp4lGQMbomI7Bom8= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest v0.118.0 h1:zzv0uQqa3UZ7Axiad2yVDCdPCzUMKDWLbKjRzkq7KXY= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest v0.118.0/go.mod h1:TgVgtImN3q4BNxLMWz6xLwk//UKShVerrZ4R2rGxOPo= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.118.0 h1:ydifxzu9jPr0tW80f9QIOLgjmR7qCFQD33pLWqXO6ss= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.118.0/go.mod h1:/ijU34n3G4qMoiZIOUS6nYo6XrretVkcHXx9LKyUm+o= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.118.0 h1:27C9FUe40Ci5/n6cRPxM0x76qvcDX+0hHUuORkZtbvA= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.118.0/go.mod h1:jrldBnzZVWPbP8leAwKseENmfLuE+g4KgXU5JKNoPng= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.118.0 h1:OnZwsQGs3DKeZbyLWNZY1J2xKthKkg4Myb0OP9YN7/U= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.118.0/go.mod h1:6wbKIFyIVjtzzHEFUSvk6bKBLPEwwdVqY86N6MYVsPw= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil v0.118.0 h1:nzm0/xJEzIWKydgsubNipphuYabJPF3dXc4I6g0dR2M= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil v0.118.0/go.mod h1:jORSreOnfMNkLI3KgHVRCFaj/D8gMvgUAQXzXnPf858= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.118.0 h1:dPYcq0NyUpXeJGejLvNAMZ+iaQGx0UCmNwnnn60D/Oc= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.118.0/go.mod h1:RYz6Pcxqia18V98XqWXWqXB/Qejn7vgK5PoWgMv7DwM= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.118.0 h1:p/DhBHfynUpu6jO4G2zsKlPaeXnWcqdMHMZTc0JY7PQ= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.118.0/go.mod h1:uAVNa10cWbfJsWpf73NyVi93AIR9Kk/+ygXHKKXoWt8= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.118.0 h1:jShgD4zzFxDAWXuk+5kiDuNxLc9222s4qUSISIybJo4= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.118.0/go.mod h1:QV0JiEz23p+0jDeAA4IfmX9/nAhGPrn9ZEnFKqS8r7w= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.118.0 h1:qWFugbYl7CYQ1nTRmr+AWK9UsALLCYkno7XK8g0jPpg= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.118.0/go.mod h1:gTwTRGOfFmIZhj75yqp8WVXJeTJoF5mypr19LlGRewg= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/datadog v0.118.0 h1:4IvL4o5uOf1PspPgjgcrxfPkyZQbgJP6VsyUi5KuSdM= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/datadog v0.118.0/go.mod h1:9cP+bHuftqoYmNDd8LrJ3YTzQl8S1T+qQxSeOIdLM+g= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.118.0 h1:vuPvyNTWyqJVp4hJ/Gr1i5Gqd89lFaaOjXtsVlLUlfs= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.118.0/go.mod h1:rv8ynKZtox4Lahm+1eG8zyyAsARoKiM0TZNqlMwDfE8= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.118.0 h1:Pho1MwH+cvosN6pOinGhunBwAJyyAwFnbIW5x7N/37A= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.118.0/go.mod h1:IMy3f4XjwIu+PZF9Qq5T6WZ/+mOL9l+SFjPYEQuWZh8= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka/topic v0.118.0 h1:uAJjZmS275VjGDZvg4LfLk+vrsd08iMwre048+B4eFw= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka/topic v0.118.0/go.mod h1:1q/L2R/28emNCz0EHfxEw853I6lPxTcHTqS+UrMea0k= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.118.0 h1:8pBuMvrFhU7YLJn1uhuuv5uLz0cJUyzusFtNA//fvFI= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.118.0/go.mod h1:pPjJ7ITPSA68VT7cGK9UIJkGsvfjIJV8cjB8cnnsKr8= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.118.0 h1:DSoYrOjLv23HXpx72hl61br4ZZTj6dqtwZSGoypKWIA= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.118.0/go.mod h1:nR+r7aAbsktscJk4fGmzljblbZBMaiZcIWeKbXV+HmY= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.118.0 h1:aUTSkzJExtrlHN32g8hX/cRNEo2ZmucPg+vwPqOYvhg= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.118.0/go.mod h1:a3sewj4nEozMwcNwZTHPzddS+1BnA6BaAkO/CRIGHVU= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.118.0 h1:WnOBLIbdKDdtLCmpedY35QIkCOb2yW+BxydQMEIv2Xc= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.118.0/go.mod h1:QNv8LB5TzLUHB4p413mrtLryozBRNHKwIlY2R6UirrQ= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/sampling v0.118.0 h1:zEdd1JoVEBX7Lmf/wjs+45p4rR5+HvT2iF5VcoOgK1g= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/sampling v0.118.0/go.mod h1:WE5ientZ87x3cySOh4D/uVUwxK82DMyCkLBJ43+ehDU= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.118.0 h1:iuQWJbTtl3A/wgG7Zl/mWpcBQASXeJiWWblSfu1qSQ8= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.118.0/go.mod h1:JKBSWs4Wo3B2172g6/Hcar31GM8EvlJK2lbAqElpkT0= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.118.0 h1:cNxDWIo5FNwVCEJ0OkYZG7L2FSiIoH7ASUnhjw5+yaA= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.118.0/go.mod h1:wGuwhjwdA3Sqw0gLBebku6vJ8NHqWhv8mDEOaxFsKTQ= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/loki v0.118.0 h1:TT2yBEekzKsmC9Caf20yDCijKC3t+YlSA0J1rbjYWaQ= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/loki v0.118.0/go.mod h1:cyH61RXVfqG5UK+UcjDGfy+KBrCeXNhWb1RT3cVCiZs= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.118.0 h1:iCkInN6po+WATcDQ+fSqBRCMALgLshgIwNhwO3xioBA= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.118.0/go.mod h1:MTO5isJUZBQ+h1WRaHnLJA2UZmAVjwG5U8CqohWPdyI= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.118.0 h1:ycH2OpswYo9KWsZv7i7zaI8QQUTVZZssAC48cwThZ88= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.118.0/go.mod h1:VkFMDbe3yp1xEzLyyHhQ5SZzWFXxgzuw38SdLzEet+A= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheusremotewrite v0.118.0 h1:ZellmKscolOE6l5R8Cf4ndjSvXzA6sx4ItmbviMBWSQ= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheusremotewrite v0.118.0/go.mod h1:jQKwQo7XgAUXnibEA4bq+RngO43owGFBXRqbbP50i+Y= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/signalfx v0.118.0 h1:2bouUJ4jhxXhOHlJdV7VkCMNLFBXqcrNOCJvTbt7RjE= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/signalfx v0.118.0/go.mod h1:U0toY8IlyiYci01k+ZgeG7Pb742Ral9MTvco9MPOJ3c= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.118.0 h1:Ef0H9eY8EtZ6yqZvbyEFiE5ElQNLiADYo2KVdR7a3jU= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.118.0/go.mod h1:VqUc4LGE97Qh8RddrA7+fkd4OAzhhkQ59/oE0q3TfqI= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.118.0 h1:Hj5+sK/NK5lKY6aq+d19GrFE0upk22NCWoJFPQSGA8M= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.118.0/go.mod h1:6TXkJ9mQArydxXiL6Da2VM4iEyhpcGAGI43BW/SCGgo= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.118.0 h1:rcF1K6gDvX8lSXYnglnSYIlyW9wL98A95XABxvHWoaY= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.118.0/go.mod h1:JjCx8GAMR29DytUD0osPum9bXyf5iobMBTmjUlo/JCk= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatorateprocessor v0.118.0 h1:vyxJbOr4/Ex5kwcI2D+WD1+TZADgo76epatyyy63wo0= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatorateprocessor v0.118.0/go.mod h1:xnZW9SIvGgP1wWCHescIriwqlIKPGeF2XCtAUthd1A0= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.118.0 h1:D/67TEByWyRExhiV0Ihr5DZCh6WsCpaFMUaaPeyP6c8= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.118.0/go.mod h1:qYuRkOOo0OXWAFb2YGyL+UQkyrypds9cMW+q7+dTUJM= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor v0.118.0 h1:hoX1aUlZdrC5Y4AVWONPAFhq/UOMLL4tGGOrMDANrbw= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor v0.118.0/go.mod h1:D3hu4pM6NK9Ouot8cPtsDxh6EcA/g1qOFEIOy8iOnKI= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor v0.118.0 h1:T69ugnxL3NS8lXg1FbwPbweDtBDjqKuypJ2cSfjxCPY= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor v0.118.0/go.mod h1:PA3AUH9mJOxTvi07s4NPSgkAMkKDtLTzzJgMToo8sog= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.118.0 h1:5ElmjGrphFCpidyucBTINYX5lZXCpJiFo0csZBGJS/k= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.118.0/go.mod h1:uUIOPbmhZNUXPo8tWn++5f/LR70hx4deGtVUkWlkBMM= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricsgenerationprocessor v0.118.0 h1:KSCzmh/i8EmxGd7fnj7IaY3efGZ88HyOn4nTsaUH1hs= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricsgenerationprocessor v0.118.0/go.mod h1:a7N+xIkFNvnrWjWyXoxmk9WrVGPEQxryaSU0FkiGEl0= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.118.0 h1:DyhsPf6xmvTB+aIc53koO2d9fyyq7PbSOc46psh0CWY= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.118.0/go.mod h1:8lXjHmIt7HlZvBH5bvQdaTrfesAzdVSeGRA8b2WZ2BQ= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.118.0 h1:pC1e5BvBf8rjwGb56MiTUFEDHU2LSclaqRNUs3z9Snw= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.118.0/go.mod h1:wZTrQ0XWb1A9XBhl1WmUKLPfqNjERKFYWT5WER70gLg= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/redactionprocessor v0.118.0 h1:CCNDsiYP05d+HaZAf9mmEyRy5JFSEFFxSwmjVjZM9Yw= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/redactionprocessor v0.118.0/go.mod h1:kxidBYs04ufras0m173yLcV+ndMQ4DAGFcBfiYxc7HU= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/remotetapprocessor v0.118.0 h1:JuqU0ZifBM87a6Zm6393GnzSu0MgnPwNNER6y2NhGPY= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/remotetapprocessor v0.118.0/go.mod h1:8PCH4wdM1xnDSG8k2hCCDVBloM/NmDShNtr7xaKKM08= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.118.0 h1:oNVf6dfJAy46JPwogw98YSGrQm30qdtrdQVoJswgLAE= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.118.0/go.mod h1:TXA8gBGYuK9NJeAJVdFaxQ/3DElUExT7kMQHiNqKWfY= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.118.0 h1:p0WId+SoJIm3RMidEqsXqZ86u6+815I8AnCXQHgV27Q= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.118.0/go.mod h1:J103TDmU+aY8mMbYMuvAZWRugt4crQlmvVOg97eZckY= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.118.0 h1:aTWOuC42eWr6Z/unoHiV1oQwZ27F5sszygoLE5p45CI= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.118.0/go.mod h1:YerB7SYBjfS0j1zpfg7EHezUHKn9o5L5YlWG8U2uYdg= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.118.0 h1:FeuA6WtwfYskdlOcObQejkVcq1KV52DekrsWrB2xoho= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.118.0/go.mod h1:7f2OpY4Ir72hrPg+ElDYaxo8VMM2ttou4jC2+zsCQg8= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/sumologicprocessor v0.118.0 h1:p/7XJAU4kVS1j+TFS88mvJNlZp6amDNAG06YISTNNV4= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/sumologicprocessor v0.118.0/go.mod h1:DbEd9omp65Hs9EqnRiCBrNUxLUwdlL1VhvPVkuBPHaY= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.118.0 h1:vOVsKrrRjfOYSvOu3Qv7MIHUZSVL93tnHETBU+GGxsI= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.118.0/go.mod h1:NxqPda5zVnG8RiCgff0L2EfdIflsC/wkRTLNdlYgN/E= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.118.0 h1:ZeOm/Hf/zCcpqIa6zbZ80uy1W0/HR/ib18rTj7cuQ4I= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.118.0/go.mod h1:0WO9Sxt9rPjfe88wnP4SL/M09nohh3H9NX634fem0b0= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver v0.118.0 h1:vyYrEVeygmoimh5FDL+YwhBoub7IYb+wQa/BfgOkLXU= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver v0.118.0/go.mod h1:lZlx2GdpBxfVM+uTP7qThxcbvLU1/SNBcRojg5KmQV8= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.118.0 h1:j/961n8IAbqdw6NoWrnJLTADnLzH3txAZhMocaUi+3o= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.118.0/go.mod h1:6LGm+uv2Hv0D9OCJ/7d5+2h+he/8YbQT7lV3rFrUskA= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.118.0 h1:zHRXkCwg0/Mz0tnb15T3sltANwMzQyJyDDnYor2is2c= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.118.0/go.mod h1:zu2HyeyHz5WG1ssJSRCsHggM06IAaEDsm0eGFFedKpQ= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.118.0 h1:e8OEOvJYhQnuvptP9n8SSYg1IMgNOS6hdlqcfIwKvuk= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.118.0/go.mod h1:tjPCkKriInHpjeLmMx1MN2njHUnIT/936bFzAQ54XwY= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.118.0 h1:xBhG84x+FIlIuaeFFRa4GB6tEBpUsyXCdj00EFobjlc= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.118.0/go.mod h1:QuTB8IztxTZt2YZUPB6q9yZk2H0Wm5bQP1ap6D2LNdU= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.118.0 h1:ZKedpw3/P2iAW1mkPij/AP0q4bSY/3BjH5k6K50wgmk= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.118.0/go.mod h1:Vx5ZkbyLKL01R44rHNn6FwdVrY7x4LxLMi8f1Zmxk1g= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.118.0 h1:hdq0EDq6gCjOWl0RfXhAcSepB52QHx7us+UcUYTbWpg= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.118.0/go.mod h1:9kAczl5meDgn9zlLJJre8Q/4U43cqh9aAy3kCm/rJlk= +github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.119.0 h1:Zo4yD6JrMh8B3lOAVC4P3i9nzoc8eC5AYyHSvgUUiSA= +github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.119.0/go.mod h1:b2bp7SLlJ+llUI9iATQbwYb1Qe/A8qEKMvApjiYcanI= +github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.119.0 h1:FU6IlRjEHztSHqmaQpsCdUPGT+8k3Eicz3cJ/bjvdFs= +github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.119.0/go.mod h1:Br1bJZTN7O84nHyNFMoQv247CryglwdShZXWdIgcAkE= +github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector v0.119.0 h1:qrf38DokXg3lrOG13ph10b8g86mcxgqWONNRSgJX56A= +github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector v0.119.0/go.mod h1:1Dm/lmI30p2K+lk3kRl1nLQ5UBIQtAyQv5m1CqXFmy4= +github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector v0.119.0 h1:cHM5PgifIOQKlf3+aKteNxx3P8hzpbSA4ACNPndTViE= +github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector v0.119.0/go.mod h1:W7EpTg5dUbhe49kpl5h0e1W4e8j2ThIWMBoAlAdNrow= +github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.119.0 h1:8cqbXDg6qw/MtietHmy32089NsNnna+C7XI1wXYuOp4= +github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.119.0/go.mod h1:lN1WmtmDnZ0oPwZJUyHUFXG6z1SokTr9rQWN01JsQtA= +github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.119.0 h1:0eIwc699pvvChuyKDexhl3xovAQzc18xVOvxJ7tv9r8= +github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.119.0/go.mod h1:Cmey/JEL25DSYfYNxSNpunKzuebMypjZs3VsNc4JSeU= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awss3exporter v0.119.0 h1:0FAtPJ8yCZgMVRoKz1YjlaZhyOaV7QJWFDYpTVvMV2Y= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awss3exporter v0.119.0/go.mod h1:3wvrLx2DPLts6vLXG6u+GdC/yvn1lpSDfiwiDnQGzZI= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.119.0 h1:39iyJsiU3gV7a23UlAc7Ho94VheZqNJVHjFcKgb0Tx8= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.119.0/go.mod h1:mEKW51si92Y29AcgoZaK7cqCrZpvWSUpUm+Nm3O2IDw= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azuredataexplorerexporter v0.119.0 h1:dk2s3idASqV2yoaBEiL3XEpwGMwrXwFeo4gq94mkqo4= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azuredataexplorerexporter v0.119.0/go.mod h1:uKVp1xqykLdAw0MCn3VHl8vs+FNTcrQQwNA/algx+s4= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azuremonitorexporter v0.119.0 h1:jRnw6rOtjwx9/v5dtGS1x3rz1zLIYcJzz7wD+cP7CVQ= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azuremonitorexporter v0.119.0/go.mod h1:EhfzPzrswPg+sFtbrUsTaH+qxEdMPiLJ3w4dJ1lYUAo= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter v0.119.0 h1:VjDRhN9nPVwl06A9Bm8EHUPcBHcWxl/g9yohRWb+4qM= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter v0.119.0/go.mod h1:hm5PXNkfCu6hC7lrMDowsATJAnDsaEoalR3tnz/07PE= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/cassandraexporter v0.119.0 h1:pzn/nI/CFYWCfHzCLXKUGLaRbjGsuewiM8xfyPkCGvE= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/cassandraexporter v0.119.0/go.mod h1:BSbiQT/DiHtR8dmpMDQ8ArZVV6NHmzn3BtpXBhW+FrY= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/clickhouseexporter v0.119.0 h1:/P7aeHH164dXMFLul42AoMZef59f16VhkuQzyWw8XSA= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/clickhouseexporter v0.119.0/go.mod h1:obHqkff5ws7kXnJFGKkfGlc2quf+y2SWW8sEmpPyWHc= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/coralogixexporter v0.119.0 h1:iOfjyGnzXfe+/jFioc3v8sGfbbXj+Av1JwT0/4nKGDo= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/coralogixexporter v0.119.0/go.mod h1:JBIv8fzaT+VH7x2m+T2uBa01tUVt/4IeSs5L3fcwv7E= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.119.0 h1:7KBXKZ3yGpjAGm79CSfZJtQWUcX0UCH+WD9CvmRoL8A= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.119.0/go.mod h1:wSlyROPOwEGT4oGe5jJahToUCEnT4kzz0rAVf4p2GSY= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datasetexporter v0.119.0 h1:IZ8iw4YK4DSvbow/7O0bwP6A2lsmUcfSZAVCglyfKaM= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datasetexporter v0.119.0/go.mod h1:BZBHJ/A1ZLiGWd27eZ0NZ4D+aAer+jiv6CCF84Q7Axg= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter v0.119.0 h1:JPatHj6zo9O70JC9gUPZhT3bslIYRAEv/tr2qIVo0ug= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter v0.119.0/go.mod h1:QOZ+rBDlyP3muRr7TCvwZExF2xTFRhaA0ftlT2iAa1s= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.119.0 h1:W5ptAjJAf5vNidVdzeN6GHlRAaxk+wZmJO/dVd8EqEg= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.119.0/go.mod h1:WDlcIb8ujayQKaz6+yWIvfCL5Uo6WpoZKQFBWqCTZyE= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudexporter v0.119.0 h1:B61YdiunPiXKLidrIg8MOKeld+C/Ukbc5GzEBtQc7bY= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudexporter v0.119.0/go.mod h1:TdryMSy4GKNuC1GI6TfmQjpnDT57ZJdRZT8Eqj/lM8k= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudpubsubexporter v0.119.0 h1:PycP/gQPardGM0ty7fkWvyCVp3bJ0ZTYScFvfccfQCk= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudpubsubexporter v0.119.0/go.mod h1:UrTrNLhG8ivTeDsdmOe7ElLdSZ9252SwoOYG0DkGsuk= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlemanagedprometheusexporter v0.119.0 h1:KILJepxu/serXFfxaeS2ZX2LxUE5joXy9kj++NBqbCk= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlemanagedprometheusexporter v0.119.0/go.mod h1:MsO/R+gix/Szh5Ku8npAX06c8abT6fyg62sgamqVAt4= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/honeycombmarkerexporter v0.119.0 h1:MIHpKnU3AVnifarhd33P527qSf8qwdxRvm4u5DJSnMI= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/honeycombmarkerexporter v0.119.0/go.mod h1:7TaXJhp6+ChURaF1LPrb/c1Ovc/3mcTqRG06xnet7H4= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter v0.119.0 h1:639mMgLS0Q1sE6ZeSSaN8no2ezwMmAfdq2jBISJopIo= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter v0.119.0/go.mod h1:kQ1AhNLnO2O2QrEAGEYgmCZxSQsgGVlod3yJVWMbwhg= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.119.0 h1:zQm1CkEuk7HjLNcXQ8WIH1t8WHiJDqIQUMjbTHWRFIY= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.119.0/go.mod h1:6Lo1g1yHyIubBggpk+ify0ORGI7Z0C4xCCpEIzyMXdY= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter v0.119.0 h1:+X/CvlCtEQOlhAmM4vMqlPyy3gocwmzZewh7gAEo7po= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter v0.119.0/go.mod h1:M4DuuyCp8tLzI6KRoZ8jjYUfr0GFohznWP9bg4/n7tA= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/logicmonitorexporter v0.119.0 h1:fNrHSXd3zLJYciAU2OPMuwjU3w98xXBLDdjvCh4oYYM= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/logicmonitorexporter v0.119.0/go.mod h1:Ha3vChYy2wzYsCDRQIZwnhpNWEzSRxXMfhX1MD+iNZU= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/logzioexporter v0.119.0 h1:SmH/L7E9qx6vTMyZEThaNMdRGk43OMzkDt/N4w84XYQ= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/logzioexporter v0.119.0/go.mod h1:3lC9hWsk8tCZ/HdsLDtVzea+8TGKHoZp8eVJDJpi2Rs= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/lokiexporter v0.119.0 h1:5Qq/mPvK8/pRiSWTSVbwKPTguJ3OuI1MwefAcNsvSIc= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/lokiexporter v0.119.0/go.mod h1:xqVqiwaOZayLgbCcZCy2otPjT3S2Xz+YymXZr1+t8Hg= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/mezmoexporter v0.119.0 h1:EJJpmjbJF5Lw50D1L73A/iViweeXqlFldtE7VwBtapw= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/mezmoexporter v0.119.0/go.mod h1:agpouJydh2i/S1UPZ9HKY8VWoWwyFl1bl+iAfj/5+3E= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opencensusexporter v0.119.0 h1:bk0KKiDWiaMvMb/EdGL6X6aT9D3Zlh2FlkRuLrEqUPo= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opencensusexporter v0.119.0/go.mod h1:WQ+yJTS27co5mO4L4VfwA0ewo5n+gNDXtwAfDNt+VUA= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opensearchexporter v0.119.0 h1:FQ/gskyDcLvvfAuEswbEw+2yM3h2ycDI/0iQEydhR5M= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opensearchexporter v0.119.0/go.mod h1:OjdwML2o5ibJK/TUstKFaOW8YruWZZ8+yQso934Vzys= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.119.0 h1:oHP6ndUMZ5yeHqMdgDuShuGKZkG2TChIOP7to86UJC0= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.119.0/go.mod h1:L94/m4E8u8o2Eakyho+dJBVoHImOd8gveBSwMnrIkEk= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.119.0 h1:Uw2qT8XxWEp+0YSeBEQuRlXgnvam8B3IR+6Qu0xKvwg= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.119.0/go.mod h1:zaYmXAbN866u9Wj/YAxlY4p2/lyzlE554Ql/FgI3J5A= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/pulsarexporter v0.119.0 h1:ZIceJm66zF7G+NYroSKGxuYPEgQaCHsfZxhxQPncZ0Q= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/pulsarexporter v0.119.0/go.mod h1:SOLSousSv2/r6yBipZ5t6kuj0OLFqyhZZAu9bXS6Xg0= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.119.0 h1:/tDz8joUpcory1ZHLQ8D6RVEzpGhsbCUo8VFFZEGnTI= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.119.0/go.mod h1:xk2Y04EFtB6DDx/Z6ISN9sC9JmwahIOPYJxwh+cMcaM= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sentryexporter v0.119.0 h1:6PDORwMKhhJ09D0tM9p37FP7dCwmFeYkoC7MuXY+O4o= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sentryexporter v0.119.0/go.mod h1:li4SUOzds3dWUHHBOzvc68gt/k+DLODSNXtq57gYZpE= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.119.0 h1:QRLAGV2lbXMPE+jRYEHMmjpXD5B9lZ6tlDGbGpkU9Mo= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.119.0/go.mod h1:k8dfmLRM81nyIp89selnd+3XGYLnlFFBZ39QWVu0Zls= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.119.0 h1:FMkx5SCsO8qwbX2c+PzUjEbQ7wmJB+N9h8HSBMK+ioc= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.119.0/go.mod h1:d6jkag0d2Iq2S+p4EFSWMhzaM0lmvvTF/p1rie/9DJk= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sumologicexporter v0.119.0 h1:eXrbv2wehmcfG1MfSU7E6/s945Lptd4JMN7+xZtUXwM= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sumologicexporter v0.119.0/go.mod h1:v+nzaKVtay2JOcwDbz9p8hGpbELbAJdxCAFustkYXFg= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/syslogexporter v0.119.0 h1:GmM5QCi2vTEslJ4CaXjoB9agu52t9KPUNv8GDnTu6jw= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/syslogexporter v0.119.0/go.mod h1:6wbr0cIWQuuPUXCUwgiSRONI5tu5T1aUj6pQEXRJKfk= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/tencentcloudlogserviceexporter v0.119.0 h1:YUD+vI/H0+HGtDMfSrEf5kmkq0OH8iKAKvKq9iQxBWQ= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/tencentcloudlogserviceexporter v0.119.0/go.mod h1:yGehHKWIUpXPTaS7YO19tIdoTy8CdTKnObw/IJAt7vg= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.119.0 h1:omQ/R7wDbmUDLd63IZU/SDwprMBcXr/f65Mho64yjhg= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.119.0/go.mod h1:L2arkZ23FofF//zpkOo7Hcg4fe2AYGHbHjMRacRyexE= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.119.0 h1:zzNRPHTSmLGXMO5G7gwJ1QkNuIYBR1Q13ctbw/PWd5U= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.119.0/go.mod h1:s9ijlpmNEF7ZlsnJPIG0yVz14AVqIWvlu2kvYh7OCLw= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding v0.119.0 h1:nM9VXtISMJwL9W1AMZ9zgC4JDX9Q0G2pPy48wsB2bBw= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding v0.119.0/go.mod h1:7TjDVF099yeeU+f+qeAsULoLgfolLRq2hPufE+Sbc9o= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/otlpencodingextension v0.119.0 h1:u8u2+/75+Q8ZPOmybOuHpFg+w8V5ONIoZjjj2NlW2g0= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/otlpencodingextension v0.119.0/go.mod h1:3KdeXgI3+eiy8o9ULHvoNiV0WSlJMXddYu6DgfMB5As= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.119.0 h1:2rJGw7Du16sanQo64b2x6qDh2WkYTIB/k8ztaEp96hA= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.119.0/go.mod h1:lOeos0lj5TR84xGqXbE7jR4VQOOuY+c6YhU9Sk+Xpbc= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.119.0 h1:p51SVzm6p9qCuaRNiu0mG8UZR+3fw8Pz8tDMZJiR9Vw= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.119.0/go.mod h1:Z23YzDI4MLP68FoL5bS4xyQsiTuth8jJEr1cWiHnHUA= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.119.0 h1:kA7Ea6e44WV5tch9PTWekj/LkbRSELhRdC4QTOsyw2E= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.119.0/go.mod h1:bmPxja90DNmR0bo1fuQ/sdPon7jI72AzU0X6jsdABWM= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/sumologicextension v0.119.0 h1:04os2LykSMvdW8khEQDtvk150RESimzCQLRVilU3sg4= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/sumologicextension v0.119.0/go.mod h1:8ryGwbyDwngV3IQadAUaf0uRHQcxjkPTplU+iOnhSXM= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.119.0 h1:LlxMj5seXi/cVErs61fmRojj1Goo3bYvgFOpJMtlwwo= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.119.0/go.mod h1:cN2XY980uuIPD1ZOyjDbMzxWLoHBufZqRKWeEx/LugU= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.119.0 h1:U/j+jjOId2iiudkHN5EOqmZoMSDxWXTR6N9xGdj3bh8= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.119.0/go.mod h1:K6fKwsOcIEkOMR7CitUWBYaS8yrb3Y2TjM1ocMwgJx4= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.119.0 h1:tS//iYtDvw/LnUN4Vk8d4RJUXFbxX94WodT7icgwTd0= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.119.0/go.mod h1:ulPAZNqV35a6IlRZq3FC5tgYzyCSMgFyEMYZWwFI0YU= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.119.0 h1:o1s1koCc7Rg2auZLhFc2Ja6Eo2rOCMHKZJptRwdhoTI= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.119.0/go.mod h1:8rSWjIfW9QDA3KHzdZIfGs+Na0HBEmKg2EMmMplK1X8= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.119.0 h1:3H9R5Ztc4ISphy+bRlHHExqtS04PBYi7Fptwl9XA52M= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.119.0/go.mod h1:txjr7nwuLZUBitwpU4G7EkZ3gyMBfI/4DXMJxX6NAtU= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.119.0 h1:+obWJtiYqEHl5JQ3nSmPXShLWQMxDoCC2ejXdpaqSCo= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.119.0/go.mod h1:xSC4wFMEg0u8E+nOQokmuFtNdGIHNp16NbzfwmOnOaM= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/metrics v0.119.0 h1:F5EFo4KfeX++YcOF2x/PMEUDHaPNN7s4ikXVix11A4g= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/metrics v0.119.0/go.mod h1:kgJtFw0KSX3m5LoU+W4D1IqcYNs4y3DVv9obT45p6MM= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.119.0 h1:Woc64WQAdBO7EhprsHXKC6zQY+GDtk+Ji3hT1s57Hj8= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.119.0/go.mod h1:dNCyfdeAp6aM1PGCamx6ZSQtaNpiHOuY6uiEIZev3p4= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.119.0 h1:Rfn7AHN559aaxqKwFWlG36HuHlhl7dbIspKC/O1H8EQ= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.119.0/go.mod h1:GhC+Pk3PbAIq52vmYr+d6PN4Hnxyp4lGQMbomI7Bom8= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.119.0 h1:7RVRR3rYnImhL1q+w5QcNGVhY22rcYffzoIuZ1BFHpw= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.119.0/go.mod h1:z9VwT4W5chD4duxfrdqtaoFntM3DnlOKT3CSz3Tb/iA= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.119.0 h1:Y1L1ewaHclsqVLkHvYzGzBSZiQI8C6VT6l5OSu1zdAE= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.119.0/go.mod h1:jEWVyvdRCAwowCJruxYIZrwl7OB9pdf5xHbcuzMr+FU= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.119.0 h1:9ivuvcvfagk7ppQmtQUOgH2nFJ66tsgyccEMcXPKoDI= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.119.0/go.mod h1:Fv/VznY6QoEJd34B0DqHXctRgABY3eLNFmpCnkfUeLY= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil v0.119.0 h1:GsiUtdLXgDzZkaDGnbDy47EHoDqKYVNMvX0PKWF1EKI= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil v0.119.0/go.mod h1:Cx/iI+dXpsifBnU9Ch4hN1de5R8dvnyiQJecIc1ty7M= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.119.0 h1:5UZBu9vLWlSCe4u4CvoIrRTsGBwuMApXkNf0nIp3z8E= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.119.0/go.mod h1:dA39ERuz+UsIgAcXyd7tdF69Rr1kh3PmM9KiwHFDjDs= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.119.0 h1:PDG8LmukpSGLt6D3imyKr+5bk9WDVMhEvz87hDHkYbE= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.119.0/go.mod h1:KsWkH2vZT3e8fzbB1MQnLT+EYXXNqfqIlzsqr/Iq7wk= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.119.0 h1:gW8WxdU8xY1pYUDIgACpajqIVC+a8MWMEp7DQ2hrDnc= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.119.0/go.mod h1:Ojg3hh6B+WUX4thzM0E0slXVooec/wS7WCJ35DvgIfA= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.119.0 h1:TIYKBeHvPDbX1YvCfjzki87OCIA1t7RSsQX+h0z8jE0= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.119.0/go.mod h1:eyPvKWxE5lkTCeUa1thTbg/tq6muTwWStDG3CumSr+Q= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils v0.119.0 h1:5F+Xa3A/xdlA9x2XdFEATeMhcU4R35TSIs3q6BynqCM= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils v0.119.0/go.mod h1:N6FGJBXj0QY/e9zjdlIWGCKHD+fKUwUtreAfAZRyoFA= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/datadog v0.119.0 h1:dit5qDsbc1UQjoBswdK6XaxSvDiltteUqK1EYxfaZIM= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/datadog v0.119.0/go.mod h1:9NO7zx3H/Kh80BxyaKsD0TiCYAgxmyh4wxopW/8BPr0= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.119.0 h1:O+/n/6osRr7Y8IdNLv+OyjH6ztW22AcT58w25ZqOjlM= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.119.0/go.mod h1:7xNWOEKdIqjJIQTnHnD8oHKK1IXgCbhjMOg5nmgruok= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.119.0 h1:Nc1rvF/hxp8TwYOSsA2qmvIQlS+8lougZsyxcTN6U78= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.119.0/go.mod h1:7ePS4L6s7UcWxxgIQkAiI5db/OxwRAV9+kziKVIO3Y8= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka/topic v0.119.0 h1:iPwoMVWXVtJLj/3NtQK44FgGicECl4mN7PyH6u5UpKM= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka/topic v0.119.0/go.mod h1:1q/L2R/28emNCz0EHfxEw853I6lPxTcHTqS+UrMea0k= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.119.0 h1:ql3Ujsfiwd1uKAJfK+EbUnLXz1NcStK2q5PRNBqJaQY= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.119.0/go.mod h1:Df15ipOX4JryZDCEiFhByJNgycMOoO6AP0XB/oeqtH4= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.119.0 h1:2ztsxw6DH2CbXbykCGgPSZmHHRilNuD06VOfI/z9xGs= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.119.0/go.mod h1:q5LK/pXBToCu4W+tSVWM2ST5jOWqvDMVVCB7TQqhsbY= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.119.0 h1:qSnBSa1zO4szSQOrVyinm/9Bg68oYv6NarcaV4Rusr8= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.119.0/go.mod h1:udnlBYxPMO+odronKnPfYY8M+BnxfaQFXuJgfI5miUw= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.119.0 h1:4e3IV4fgpbyx8E7J+NI9P3R1bREZKw0rIb5ZPGGWyII= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.119.0/go.mod h1:gfUz5iaAWymHyB6rG/Yp3ss84wqjf4rQ5GE0KU8F90c= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/sampling v0.119.0 h1:wSvkLojbTk2dVcXgsr3aNlOxYvkl790vVlwYFobSV9U= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/sampling v0.119.0/go.mod h1:2nyI8d4nBZ9xVIxM7S8DlgqO0FeKAaokYQmxoh0M4pM= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.119.0 h1:DW7f//w36CbuCCoqSHEry4zlMXBqiICcFqEsznxZTwg= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.119.0/go.mod h1:T5e1r/S/4KHms5WXhxvd8L+2CExgnoXsKGj8Cr0pa3E= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.119.0 h1:MK3w0xY2ADCS35pje+Q6P2BDWkGJXx5dUYAoavbtWAk= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.119.0/go.mod h1:MTQTbbOEWuJhuS5FZiAC0nCCztTvWEly/8wIZpNhi98= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/loki v0.119.0 h1:hMcna6tA4KSPKjt1Y6WOB3IzTUOnz0nHAqXyr4yzxg0= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/loki v0.119.0/go.mod h1:I0YLH/ajaRHkLzaU0i/3o/Lxb2SL3PwETrGVaJV6jvs= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.119.0 h1:soRKqiNT14EEnfUpvc+7A1c5ni0RTxmvO59qL4hBimU= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.119.0/go.mod h1:/9EZzPLDe3N4qLkKSmgFAy909KR2JBQ/4qPs9L4avQE= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.119.0 h1:V+BEVFHIbGMYBjbY266/JxVS55w9gF5Mxpkz+yS78AI= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.119.0/go.mod h1:jRBlowpm3Abs1ztxNMJ3HDUlnzWR4dtskEiAL8MGzOc= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheusremotewrite v0.119.0 h1:FPXUweqjxJ2UZl+Msvmc5AVTk8U45eyQCWOII1W9fjQ= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheusremotewrite v0.119.0/go.mod h1:nOQswYR0Mr/mUO0CCvU1ZXfpplvwvDmxSO7PNiUT4gU= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/signalfx v0.119.0 h1:aNdJ3IpaIPonIpyulpc5qMlc3MqxYgApyS0EV4W+fgI= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/signalfx v0.119.0/go.mod h1:FHjHz7412EAPDgO0eb+xg/iMmAV7QH3oxLtV7iGVEWk= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.119.0 h1:1c8ZHVCaO5s7DYqPifj8Cb3qB1uQdMA8eu7VxZHGus8= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.119.0/go.mod h1:hI4HvTWC6TxmyQnJXu1LqC67JwvqiZX5tLpbd9fTIdw= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/xk8stest v0.119.0 h1:ptDhiLTpUJY+NIq2FoERwipKcZbNW5m62Sd8VXzbt/g= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/xk8stest v0.119.0/go.mod h1:qAg6wgkUiX8Ue6cLLsZS//d5TvRPmj8j7ieJbtnpHgY= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.119.0 h1:gZLcPTznU086eH0iRZ0t1KhCQDPxsV0e4th8yyRNwL8= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.119.0/go.mod h1:e5Sb/dOSruRTyykbNZppUXEXeYh3cI+7ks7M3HaaL8M= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.119.0 h1:Uiw68g/rrLaSy4HiD8o2grBiBUgmkzT+W6QBCeScAXQ= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.119.0/go.mod h1:Z4+DZ0MHkE6kRMehh7L/f5KzrL12+yTBVpsPikEjAWI= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatorateprocessor v0.119.0 h1:AcZGjL6SPTwaX38gISDIrrgNGti6Q+NJSheTBxI0WmA= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatorateprocessor v0.119.0/go.mod h1:uHXkQLkxzrr7YnyQPLuikJLDb+K4EG6HXI4EIkDljYI= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.119.0 h1:uNGKTj6/vy06LuLsjfEQDy7vH7BwmN9TnPOu6xmRuKM= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.119.0/go.mod h1:9l7VBnHj4Z/q318oSKH6exUK52zYMr/V2dfJA/oVI3Y= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor v0.119.0 h1:VD87LP13ACnh7gJovJ3jy5isO2i+gVG2zsLf1mBJEcc= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor v0.119.0/go.mod h1:P+8bUN1QRYjDwn8pwXNO+sUoECFP/m+w2Pud4Gx32VU= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor v0.119.0 h1:66AgeWhNIgeDYqy3gzs7xUUgc+6nhu69BDBmmWS3bbA= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor v0.119.0/go.mod h1:UoaEnG7ZlUl6rbGf6RzIVJy9s5KkRpJjiq4+199h2As= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.119.0 h1:ZRMmF+QY+OZSZLNRpv7NN2Ib6JSFi469yexeuEyOq5o= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.119.0/go.mod h1:dOfRjw5J83TvrNhqRDamqCjYSwiow+6f7sX6ZRFVaUE= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricsgenerationprocessor v0.119.0 h1:e9gyzsUap23VslntzDMErHEaHpcUd+ngnPzK8Dlx824= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricsgenerationprocessor v0.119.0/go.mod h1:18UdbEEw/TzaSxWGa2ZMXHG1bdPNi/N0qHDMnv6V1Zk= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.119.0 h1:RnnhBiGDZ5rjtqG1ZrgXg7AU0Hpn+S2NC+tZm4bDsnM= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.119.0/go.mod h1:DbYKTD8jVIjSn5HHqthK1dGZdEeJZNnNJ8dX6jn0VOk= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.119.0 h1:4S13LKyLsVpmNYGOzNhikXKJiul2k5+eXIvBds0ZyYY= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.119.0/go.mod h1:ziktR33sMtxYppqMbGoGNpCaJLQfsnywDRpNxvnk12Q= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/redactionprocessor v0.119.0 h1:/btbe36ZWR7IHHgAjbr3yq3p+BfTs1amBol0VyHGSd4= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/redactionprocessor v0.119.0/go.mod h1:rTWuYTseVLSyeEwEub0xnVs4UZtNsNxFWLS0iaraJV8= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/remotetapprocessor v0.119.0 h1:iiKzD1spgEoCnWm9VbCW3b4LhDthMpJMM8DVXSZH0CU= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/remotetapprocessor v0.119.0/go.mod h1:bCq/DAWa9oKDyBPuG41zNDpYeEBPfta1A5x9BKoWWns= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.119.0 h1:vXZYxWXx3HClhJ2ulPpKAl/Zq/9COzB0A2uQ8u8E88Q= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.119.0/go.mod h1:klTWX28fm8xt5C33gYfALvqFhBZfo4a6I0zvGllVJ6U= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.119.0 h1:6E84Ie5d2aU+pnzuGu612UfvdAfvfBK+darD8RdzM7E= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.119.0/go.mod h1:acrmdOey6Ccj0jlgaHgWwRM9VmSfUaWdHm0H9Dz8GO4= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.119.0 h1:HoHNBgBMJsu5NtEzp6BxOe+qlcjBqYYpM78ZnZMhskQ= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.119.0/go.mod h1:inxn5Pkh3VIWVrP0HL4MEdU1eHNeVfxMKo2Z/faPIcE= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.119.0 h1:HBQqRHsRIkJbG6iFHT8Q+TJPljwUSEd75wlqiHVtA5I= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.119.0/go.mod h1:CEzAuqlTFNnxOUk8ix41TM1Bmembk+nKrhYzNN6r0NM= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/sumologicprocessor v0.119.0 h1:+4yExNs9e8M7EoSDqLo4G/lCm6IpW/b2T0KNSffssws= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/sumologicprocessor v0.119.0/go.mod h1:l8TlMm3R7Mum6gmqCL/3Cw2ewQBe4qQg92t/px1IvE4= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.119.0 h1:CwmmqxIxO4zu1M5IuYvfRIUnb1sd07AkAb1NCTuDwiQ= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.119.0/go.mod h1:PUPBqK3YG1Tqkvf520K8zMgvLBrJHtYaRMrb+E72lj0= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.119.0 h1:8HlxU1CW9qRYBSp5LdJn904NhdXAuKsklQ8PGTbdiw8= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.119.0/go.mod h1:yRAFW+mmlDKUXAZ77h+EQ4s7z/RZaGK/YClpieva5aY= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver v0.119.0 h1:6T6uajXqfeB61x0IDqAFBCtRu9C9Usk+iy2NsdXOZlI= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver v0.119.0/go.mod h1:pg57Fj1aqWeA5128uLNm33NsDCM+NDUEWn5/jYPGqrc= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.119.0 h1:TNCittWJXM1Bz4A8oEAZLcmY9EcFG+7gjgpnvLs2E38= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.119.0/go.mod h1:XMF6aIAGjHPGhmwVQMEXSNhVzvILAybaxMrJ9/zcTSg= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.119.0 h1:ff/0gXPIMvtBRPWOvgah5+WZlM24MuJKX1pgi5zKbyw= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.119.0/go.mod h1:qxe6bs7I0GN1/u0mScHVo7VuzH6nhUyXQt3Mon8jbck= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.119.0 h1:NYJP5GjdBFBOm96YyGce60kUTk7nBkAxqnAG3O91oPQ= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.119.0/go.mod h1:j1baVt1511W0U1O3swP2EPOJQvw3zEAwLaGbK1XGeQs= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.119.0 h1:fe0eV5j+yP/FZOEho1h0WWwuH4eAFRmuOhaGe0t4q7g= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.119.0/go.mod h1:ajfahqeY17eVreWZZzAQw9GZdsTxD5yZ46DfkOqq5a8= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.119.0 h1:GCzOLqTqIysP5RS6wh70o/cARYAWGl7yITyFHNl96Dw= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.119.0/go.mod h1:DSrZFUPipQcZYE2mU7NfXA89ugRfrkT3aGr7BItni8s= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.119.0 h1:8HZ1pb7toDx3bnMmbC41OI18FZvvDSAr5kQpO7+c3gQ= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.119.0/go.mod h1:2fBaiKO2FZzZ6rr0zYSp6MOcqV0r8fNss5VPK03SFnY= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug= github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM= -github.com/opencontainers/runtime-spec v1.1.0-rc.3 h1:l04uafi6kxByhbxev7OWiuUv0LZxEsYUfDWZ6bztAuU= -github.com/opencontainers/runtime-spec v1.1.0-rc.3/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= +github.com/opencontainers/runtime-spec v1.2.0 h1:z97+pHb3uELt/yiAWD691HNHQIF07bE7dzrbT927iTk= +github.com/opencontainers/runtime-spec v1.2.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opensearch-project/opensearch-go/v2 v2.3.0 h1:nQIEMr+A92CkhHrZgUhcfsrZjibvB3APXf2a1VwCmMQ= github.com/opensearch-project/opensearch-go/v2 v2.3.0/go.mod h1:8LDr9FCgUTVoT+5ESjc2+iaZuldqE+23Iq0r1XeNue8= github.com/openshift/api v0.0.0-20210521075222-e273a339932a/go.mod h1:izBmoXbUu3z5kUa4FjZhvekTsyzIWiOoaIgJiZBBMQs= @@ -1308,8 +1313,8 @@ github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142/go.mod h1:fjS8 github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/openzipkin/zipkin-go v0.4.3 h1:9EGwpqkgnwdEIJ+Od7QVSEIH+ocmm5nPat0G7sjsSdg= github.com/openzipkin/zipkin-go v0.4.3/go.mod h1:M9wCJZFWCo2RiY+o1eBCEMe0Dp2S5LDHcMZmk3RmK7c= -github.com/outcaste-io/ristretto v0.2.1 h1:KCItuNIGJZcursqHr3ghO7fc5ddZLEHspL9UR0cQM64= -github.com/outcaste-io/ristretto v0.2.1/go.mod h1:W8HywhmtlopSB1jeMg3JtdIhf+DYkLAr0VN/s4+MHac= +github.com/outcaste-io/ristretto v0.2.3 h1:AK4zt/fJ76kjlYObOeNwh4T3asEuaCmp26pOvUOL9w0= +github.com/outcaste-io/ristretto v0.2.3/go.mod h1:W8HywhmtlopSB1jeMg3JtdIhf+DYkLAr0VN/s4+MHac= github.com/ovh/go-ovh v1.6.0 h1:ixLOwxQdzYDx296sXcgS35TOPEahJkpjMGtzPadCjQI= github.com/ovh/go-ovh v1.6.0/go.mod h1:cTVDnl94z4tl8pP1uZ/8jlVxntjSIf09bNcQ5TJSC7c= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= @@ -1407,8 +1412,8 @@ github.com/scalyr/dataset-go v0.20.0 h1:VZJew4W/ufnb67yZSpWQKI40U4XpA+w+cDM+mk0q github.com/scalyr/dataset-go v0.20.0/go.mod h1:k/A+KhdEyffuTGb1n+jSWg8J5ikV9iYVKejVGjGXXoA= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/secure-systems-lab/go-securesystemslib v0.7.0 h1:OwvJ5jQf9LnIAS83waAjPbcMsODrTQUpJ02eNLUoxBg= -github.com/secure-systems-lab/go-securesystemslib v0.7.0/go.mod h1:/2gYnlnHVQ6xeGtfIqFy7Do03K4cdCY0A/GlJLDKLHI= +github.com/secure-systems-lab/go-securesystemslib v0.8.0 h1:mr5An6X45Kb2nddcFlbmfHkLguCE9laoZCUzEEpIZXA= +github.com/secure-systems-lab/go-securesystemslib v0.8.0/go.mod h1:UH2VZVuJfCYR8WgMlCU1uFsOUU+KeyrTWcSS73NBOzU= github.com/segmentio/asm v1.2.0 h1:9BQrFxC+YOHJlTlHGkTrFWf59nbL3XnCoFLTwDCI7ys= github.com/segmentio/asm v1.2.0/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs= github.com/shirou/gopsutil/v3 v3.22.12/go.mod h1:Xd7P1kwZcp5VW52+9XsirIKd/BROzbb2wdX3Kqlz9uI= @@ -1483,8 +1488,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/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/tedsuo/ifrit v0.0.0-20180802180643-bea94bb476cc/go.mod h1:eyZnKCc955uh98WQvzOm0dgAeLnf2O0Rz0LPoC5ze+0= -github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1086 h1:TlY8VHqsY4pRurqNVj4sqMU/Eu3P8QSbIyJJo1CYH+0= -github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1086/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0= +github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1090 h1:0fZ+FZE7ZvqxGdYbtQW8OyPXGD1qGPmg4wT+Tjkv+1s= +github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1090/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0= github.com/testcontainers/testcontainers-go v0.35.0 h1:uADsZpTKFAtp8SLK+hMwSaa+X+JiERHtd4sQAFmXeMo= github.com/testcontainers/testcontainers-go v0.35.0/go.mod h1:oEVBj5zrfJTrgjwONs1SsRbnBtH9OKl+IGl3UMcr2B4= github.com/tg123/go-htpasswd v1.2.3 h1:ALR6ZBIc2m9u70m+eAWUFt5p43ISbIvAvRFYzZPTOY8= @@ -1551,6 +1556,7 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= @@ -1578,196 +1584,196 @@ go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/collector v0.118.0 h1:OBqxppK9Ul6bzEabcHsx11pXwgp05sBpqYxIxiOkyFo= -go.opentelemetry.io/collector v0.118.0/go.mod h1:yxfijW5k9dwd9sifTBAEoItE+ahFEtOlyvex1B99uno= -go.opentelemetry.io/collector/client v1.24.0 h1:eH7ctqDnRWNH5QVVbAvdYYdkvr8QWLkEm8FUPaaYbWE= -go.opentelemetry.io/collector/client v1.24.0/go.mod h1:C/38SYPa0tTL6ikPz/glYz6f3GVzEuT4nlEml6IBDMw= -go.opentelemetry.io/collector/component v0.118.0 h1:sSO/ObxJ+yH77Z4DmT1mlSuxhbgUmY1ztt7xCA1F/8w= -go.opentelemetry.io/collector/component v0.118.0/go.mod h1:LUJ3AL2b+tmFr3hZol3hzKzCMvNdqNq0M5CF3SWdv4M= -go.opentelemetry.io/collector/component/componentstatus v0.118.0 h1:1aCIdUjqz0noKNQr1v04P+lwF89Lkua5U7BhH9IAxkE= -go.opentelemetry.io/collector/component/componentstatus v0.118.0/go.mod h1:ynO1Nyj0t1h6x/djIMJy35bhnnWEc2mlQaFgDNUO504= -go.opentelemetry.io/collector/component/componenttest v0.118.0 h1:knEHckoiL2fEWSIc0iehg39zP4IXzi9sHa45O+oxKo8= -go.opentelemetry.io/collector/component/componenttest v0.118.0/go.mod h1:aHc7t7zVwCpbhrWIWY+GMuaMxMCUP8C8P7pJOt8r/vU= -go.opentelemetry.io/collector/config/configauth v0.118.0 h1:uBH/s9kRw/m7VWuibrkCzbXSCVLf9ElKq9NuKb0wAwk= -go.opentelemetry.io/collector/config/configauth v0.118.0/go.mod h1:uAmSGkihIENoIah6mEQ8S/HX4oiFOHZu3EoZLZwi9OI= -go.opentelemetry.io/collector/config/configcompression v1.24.0 h1:jyM6BX7wYcrh+eVSC0FMbWgy/zb9iP58SerOrvisccE= -go.opentelemetry.io/collector/config/configcompression v1.24.0/go.mod h1:LvYG00tbPTv0NOLoZN0wXq1F5thcxvukO8INq7xyfWU= -go.opentelemetry.io/collector/config/configgrpc v0.118.0 h1:if8VfsnnHwVX/E+GgehVXKh85YtAtVci+c4A/M5gPh0= -go.opentelemetry.io/collector/config/configgrpc v0.118.0/go.mod h1:TZqpu5s/iEW5XmhSnzrhXCUQ3W5qaICNvlllBf3GGcw= -go.opentelemetry.io/collector/config/confighttp v0.118.0 h1:ey50dfySOCPgUPJ1x8Kq6CmNcv/TpZHt6cYmPhZItj0= -go.opentelemetry.io/collector/config/confighttp v0.118.0/go.mod h1:4frheVFiIfKUHuD/KAPn+u+d+EUx5GlQTNmoI1ftReA= -go.opentelemetry.io/collector/config/confignet v1.24.0 h1:Je1oO3qCUI4etX9ZVyav/NkeD+sfzZQRmwMGy51Oei4= -go.opentelemetry.io/collector/config/confignet v1.24.0/go.mod h1:ZppUH1hgUJOubawEsxsQ9MzEYFytqo2GnVSS7d4CVxc= -go.opentelemetry.io/collector/config/configopaque v1.24.0 h1:EPOprMDreZPKyIgT0/eVBvEGQVvq7ncvBCBVnWerj54= -go.opentelemetry.io/collector/config/configopaque v1.24.0/go.mod h1:sW0t0iI/VfRL9VYX7Ik6XzVgPcR+Y5kejTLsYcMyDWs= -go.opentelemetry.io/collector/config/configretry v1.24.0 h1:sIPHhNNY2YlHMIJ//63iMxIqlgDeGczId0uUb1njsPM= -go.opentelemetry.io/collector/config/configretry v1.24.0/go.mod h1:cleBc9I0DIWpTiiHfu9v83FUaCTqcPXmebpLxjEIqro= -go.opentelemetry.io/collector/config/configtelemetry v0.118.0 h1:UlN46EViG2X42odWtXgWaqY7Y01ZKpsnswSwXTWx5mM= -go.opentelemetry.io/collector/config/configtelemetry v0.118.0/go.mod h1:SlBEwQg0qly75rXZ6W1Ig8jN25KBVBkFIIAUI1GiAAE= -go.opentelemetry.io/collector/config/configtls v1.24.0 h1:rOhl8qjIlUVVRHnwQj6/vZe6cuCYImyx7aVDBR35bqI= -go.opentelemetry.io/collector/config/configtls v1.24.0/go.mod h1:d0OdfkbuYEMYDBJLSbpH0wPI29lmSiFT3geqh/ygF2k= -go.opentelemetry.io/collector/confmap v1.24.0 h1:UUHVhkDCsVw14jPOarug9PDQE2vaB2ELPWMr7ARFBCA= -go.opentelemetry.io/collector/confmap v1.24.0/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= -go.opentelemetry.io/collector/confmap/provider/envprovider v1.24.0 h1:jAtaNR4b5gnddNzyfcpIhURSDq4rai667yV1Ngmku2Y= -go.opentelemetry.io/collector/confmap/provider/envprovider v1.24.0/go.mod h1:X0BuIYyscilkwApnmxlrdz0kTVWgKXq2ih8sTWm8Zio= -go.opentelemetry.io/collector/confmap/provider/fileprovider v1.24.0 h1:QoQulv9L20MhD1TFWH1scbRoo0bxbZqF2quh1VRNMh4= -go.opentelemetry.io/collector/confmap/provider/fileprovider v1.24.0/go.mod h1:ljIH/rWIUHJeWIDEKMRU/ufol/bcgC7ufamchtuTAwM= -go.opentelemetry.io/collector/confmap/provider/httpprovider v1.24.0 h1:1mbj6HlVZ4LNVBYrxM5jQEJKxinpe0LtNZwI7i8pQNY= -go.opentelemetry.io/collector/confmap/provider/httpprovider v1.24.0/go.mod h1:xM2qJmW6mB1lzFpLWIoxX/h4tUnoYTICZoqPND9YWi0= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.24.0 h1:Ncr7a3HbVpmjAvPHd0yQM/MV2p7HqJe+zvDPmHdjSCI= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.24.0/go.mod h1:i7omVh3uK8efpr7/fSAcOh8Xiv3FLYL26wUuON9i1WI= -go.opentelemetry.io/collector/connector v0.118.0 h1:amay4UriWrtydaAxjQ8/MTTaVYERlZcYLCAGcjoBejw= -go.opentelemetry.io/collector/connector v0.118.0/go.mod h1:R6jbMrHZYg21pZ0nsoo4cSHIn7Lrdpi5R3OWcDEQwhE= -go.opentelemetry.io/collector/connector/connectortest v0.118.0 h1:hLMSTqtFWveXa3b1qJMEaWuaX3PHx7dfl8G/bsac2fE= -go.opentelemetry.io/collector/connector/connectortest v0.118.0/go.mod h1:hm6TNLiQLe65NpENCFsFoiO8fOf3BbN4UF1heUsT73Q= -go.opentelemetry.io/collector/connector/forwardconnector v0.118.0 h1:TVdyYTQGK/Tmy2l2MGX2DuJ0NSgaNhOPZaNbLnNmep4= -go.opentelemetry.io/collector/connector/forwardconnector v0.118.0/go.mod h1:mKhrxSKCn214Sku8ssCt34EamEFlv5/AlivLfmWA054= -go.opentelemetry.io/collector/connector/xconnector v0.118.0 h1:0s6rwZmt8va6xd3BEZs7s2QBNFNjLv0kzYi6l44dKqc= -go.opentelemetry.io/collector/connector/xconnector v0.118.0/go.mod h1:12mJPGWo90iZrrpgOkmSd5TkejweL34V/R6AqwqJnMA= -go.opentelemetry.io/collector/consumer v1.24.0 h1:7DeyBm9qdr1EPuCfPjWyChPK16DbVc0wZeSa9LZprFU= -go.opentelemetry.io/collector/consumer v1.24.0/go.mod h1:0G6jvZprIp4dpKMD1ZxCjriiP9GdFvFMObsQEtTk71s= -go.opentelemetry.io/collector/consumer/consumererror v0.118.0 h1:Cx//ZFDa6wUEoRDRYRZ/Rkb52dWNoHj2e9FdlcM9jCA= -go.opentelemetry.io/collector/consumer/consumererror v0.118.0/go.mod h1:2mhnzzLYR5zS2Zz4h9ZnRM8Uogu9qatcfQwGNenhing= -go.opentelemetry.io/collector/consumer/consumererror/xconsumererror v0.118.0 h1:/kkWdw1PQtPb1noZMTt6tbgP1ntWdJ835u1o45nYhTg= -go.opentelemetry.io/collector/consumer/consumererror/xconsumererror v0.118.0/go.mod h1:2mdXnTT0nPd/KTG9w29cc1OGKBLzL2HW+x/o7QVpCpI= -go.opentelemetry.io/collector/consumer/consumertest v0.118.0 h1:8AAS9ejQapP1zqt0+cI6u+AUBheT3X0171N9WtXWsVY= -go.opentelemetry.io/collector/consumer/consumertest v0.118.0/go.mod h1:spRM2wyGr4QZzqMHlLmZnqRCxqXN4Wd0piogC4Qb5PQ= -go.opentelemetry.io/collector/consumer/xconsumer v0.118.0 h1:guWnzzRqgCInjnYlOQ1BPrimppNGIVvnknAjlIbWXuY= -go.opentelemetry.io/collector/consumer/xconsumer v0.118.0/go.mod h1:C5V2d6Ys/Fi6k3tzjBmbdZ9v3J/rZSAMlhx4KVcMIIg= -go.opentelemetry.io/collector/exporter v0.118.0 h1:PE0vF2U+znOB8OVLPWNw40bGCoT/5QquQ8Xbz4i9Rb0= -go.opentelemetry.io/collector/exporter v0.118.0/go.mod h1:5ST3gxT/RzE/vg2bcGDtWJxlQF1ypwk50UpmdK1kUqY= -go.opentelemetry.io/collector/exporter/debugexporter v0.118.0 h1:MUZl270SJSU/fDpIr5cJ+JEPrK6OEsHllmKauWYhxxQ= -go.opentelemetry.io/collector/exporter/debugexporter v0.118.0/go.mod h1:SW3j4Bl3uB/nbTC1D0hog9TcelVot9RXQnScCwx8azw= -go.opentelemetry.io/collector/exporter/exporterhelper/xexporterhelper v0.118.0 h1:wC4IyE98DR4eXVyT7EnA4iJ6s+sbUTZVq/5KoVWSKDw= -go.opentelemetry.io/collector/exporter/exporterhelper/xexporterhelper v0.118.0/go.mod h1:spjZv9QX+pCcx/ECSqlo/UKCYJzp2rR5NsvIgpfdUxQ= -go.opentelemetry.io/collector/exporter/exportertest v0.118.0 h1:8gWky42BcJsxoaqWbnqCDUjP3Y84hjC6RD/UWHwR7sI= -go.opentelemetry.io/collector/exporter/exportertest v0.118.0/go.mod h1:UbpQBZvznA8YPqqcKlafVIhB6Qa4fPf2+I67MUGyNqo= -go.opentelemetry.io/collector/exporter/nopexporter v0.118.0 h1:YX+pX1bVv3IJtBmrAN0waJnFWe9ynCfIRhvmVMTg4Cs= -go.opentelemetry.io/collector/exporter/nopexporter v0.118.0/go.mod h1:vWBRmNyRqN7nzu7sXjrSuVZPnpKZnKAG4ct01jL8xrg= -go.opentelemetry.io/collector/exporter/otlpexporter v0.118.0 h1:kfVfskZEroh3zs8HmdCLeo9weAJT5oedd+04McXEBSU= -go.opentelemetry.io/collector/exporter/otlpexporter v0.118.0/go.mod h1:iyvbf05lZdh+KObvNF0uEpaaV9YoQNofm1RRamWbq78= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.118.0 h1:8ShK60uf6nY6TlSYBZ2Y7eh3sv0WwNkUKgmh3P1U/2U= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.118.0/go.mod h1:UJXry//sSRs04eg35nZkT1wxP43tPxz/3wbf26eLRkc= -go.opentelemetry.io/collector/exporter/xexporter v0.118.0 h1:PZAo1CFhZHfQwtzUNj+Fwcv/21pWHJHTsrIddD096fw= -go.opentelemetry.io/collector/exporter/xexporter v0.118.0/go.mod h1:x4J+qyrRcp4DfWKqK3DLZomFTIUhedsqCQWqq6Gqps4= -go.opentelemetry.io/collector/extension v0.118.0 h1:9o5jLCTRvs0+rtFDx04zTBuB4WFrE0RvtVCPovYV0sA= -go.opentelemetry.io/collector/extension v0.118.0/go.mod h1:BFwB0WOlse6JnrStO44+k9kwUVjjtseFEHhJLHD7lBg= -go.opentelemetry.io/collector/extension/auth v0.118.0 h1:+eMNUBUK1JK9A3mr95BasbWE90Lxu+WlR9sqS36sJms= -go.opentelemetry.io/collector/extension/auth v0.118.0/go.mod h1:MJpYcRGSERkgOhczqTKoAhkHmcugr+YTlRhc/SpYYYI= -go.opentelemetry.io/collector/extension/auth/authtest v0.118.0 h1:KIORXNc71vfpQrrZOntiZesRCZtQ8alrASWVT/zZkyo= -go.opentelemetry.io/collector/extension/auth/authtest v0.118.0/go.mod h1:0ZlSP9NPAfTRQd6Tx4mOH0IWrp6ufHaVN//L9Mb87gM= -go.opentelemetry.io/collector/extension/extensioncapabilities v0.118.0 h1:I/SjuacUXdBOxa6ZnVMuMKkZX+m40tUm+5YKqWnNv/c= -go.opentelemetry.io/collector/extension/extensioncapabilities v0.118.0/go.mod h1:IxDALY0rMvsENrVui7Y5tvvL/xHNgMKuhfiQiSHMiTQ= -go.opentelemetry.io/collector/extension/extensiontest v0.118.0 h1:rKBUaFS9elGfENG45wANmrwx7mHsmt1+YWCzxjftElg= -go.opentelemetry.io/collector/extension/extensiontest v0.118.0/go.mod h1:CqNXzkIOR32D8EUpptpOXhpFkibs3kFlRyNMEgIW8l4= -go.opentelemetry.io/collector/extension/xextension v0.118.0 h1:P6gvJzqnH9ma2QfnWde/E6Xu9bAzuefzIwm5iupiVPE= -go.opentelemetry.io/collector/extension/xextension v0.118.0/go.mod h1:ne4Q8ZtRlbC0Etr2hTcVkjOpVM2bE2xy1u+R80LUkDw= -go.opentelemetry.io/collector/extension/zpagesextension v0.118.0 h1:XkaLvST4p1/i/dsk5yCwFG4HJUUr6joCbegJc2MEOrE= -go.opentelemetry.io/collector/extension/zpagesextension v0.118.0/go.mod h1:alaAK7I7UeM1Hcs/eNqIjTLIZpqrk3mD1Ua42mJ7JnU= -go.opentelemetry.io/collector/featuregate v1.24.0 h1:DEqDsuJgxjZ3E5JNC9hXCd4sWGFiF7h9kaziODuqwFY= -go.opentelemetry.io/collector/featuregate v1.24.0/go.mod h1:3GaXqflNDVwWndNGBJ1+XJFy3Fv/XrFgjMN60N3z7yg= -go.opentelemetry.io/collector/filter v0.118.0 h1:mvf08g5VHUcyhqobqId2bVGhgcs1RNR69INGlT0LEsA= -go.opentelemetry.io/collector/filter v0.118.0/go.mod h1:Pgii0Ad2PXdxYSYYqki6Mr4gZdueJG9rDOiaB3fXf3Q= -go.opentelemetry.io/collector/internal/fanoutconsumer v0.118.0 h1:affTj1Qxjbg9dZ1x2tbV9Rs9/otZQ1lHA++L8qB5KiQ= -go.opentelemetry.io/collector/internal/fanoutconsumer v0.118.0/go.mod h1:9mbE68mYdtTyozr3jTtNMB1RA5F8/dt2aWVYSu6bsQ4= -go.opentelemetry.io/collector/internal/memorylimiter v0.118.0 h1:F2FgIe7N4UBQKybKEmpcpFjFBfVLR7ogQHTGAPQ04rc= -go.opentelemetry.io/collector/internal/memorylimiter v0.118.0/go.mod h1:1UXOl4BMaJl9hOlORAJvXNt1jc0GJazCRy9ieDdMkxw= -go.opentelemetry.io/collector/internal/sharedcomponent v0.118.0 h1:aCiwkzBL4VyPEUBmEcTnoPyld5EClJGbwyUNJhHNgEo= -go.opentelemetry.io/collector/internal/sharedcomponent v0.118.0/go.mod h1:drV6vD4acelEUOjM9cgxV5ILs8q2AYUh3EV+Pljdorg= -go.opentelemetry.io/collector/otelcol v0.118.0 h1:uSD3wU0sO4vsw5VvWI2yUFLggLdq1BWN/nC1LJXIhMg= -go.opentelemetry.io/collector/otelcol v0.118.0/go.mod h1:OdKz/AXj+ewCwXp/acZCBIoMIYiIxeNRNkbqUXvWi+o= -go.opentelemetry.io/collector/otelcol/otelcoltest v0.118.0 h1:s4yLzDUPzzPElvcOqth7iOuKe+eBo8iXy6bzAy57sXA= -go.opentelemetry.io/collector/otelcol/otelcoltest v0.118.0/go.mod h1:nNDwBOLXNHVnALpcBzkWQ/770WB3IFvEVgLjgujt3Eo= -go.opentelemetry.io/collector/pdata v1.24.0 h1:D6j92eAzmAbQgivNBUnt8r9juOl8ugb+ihYynoFZIEg= -go.opentelemetry.io/collector/pdata v1.24.0/go.mod h1:cf3/W9E/uIvPS4MR26SnMFJhraUCattzzM6qusuONuc= -go.opentelemetry.io/collector/pdata/pprofile v0.118.0 h1:VK/fr65VFOwEhsSGRPj5c3lCv0yIK1Kt0sZxv9WZBb8= -go.opentelemetry.io/collector/pdata/pprofile v0.118.0/go.mod h1:eJyP/vBm179EghV3dPSnamGAWQwLyd+4z/3yG54YFoQ= -go.opentelemetry.io/collector/pdata/testdata v0.118.0 h1:5N0w1SX9KIRkwvtkrpzQgXy9eGk3vfNG0ds6mhEPMIM= -go.opentelemetry.io/collector/pdata/testdata v0.118.0/go.mod h1:UY+GHV5bOC1BnFburOZ0wiHReJj1XbW12mi2Ogbc5Lw= -go.opentelemetry.io/collector/pipeline v0.118.0 h1:RI1DMe7L0+5hGkx0EDGxG00TaJoh96MEQppgOlGx1Oc= -go.opentelemetry.io/collector/pipeline v0.118.0/go.mod h1:qE3DmoB05AW0C3lmPvdxZqd/H4po84NPzd5MrqgtL74= -go.opentelemetry.io/collector/pipeline/pipelineprofiles v0.116.0 h1:vRdnwIU40bYtxntVOmxg4Bhrh9QVKtx5wwlxK21rc1s= -go.opentelemetry.io/collector/pipeline/pipelineprofiles v0.116.0/go.mod h1:KxDMUOfbVy8lzZ85CZEG3gCJEYMyWiBKdN+HWUwQWTM= -go.opentelemetry.io/collector/pipeline/xpipeline v0.118.0 h1:ZUVF1MYNQYZvmuL30KfP+QbVGSbFZvldBM9hgCe4J4k= -go.opentelemetry.io/collector/pipeline/xpipeline v0.118.0/go.mod h1:XgG1ktGO9J1f6fasMYPWSXL9Raan/VYB9vddKKWp5hQ= -go.opentelemetry.io/collector/processor v0.118.0 h1:NlqWiTTpPP+EPbrqTcNP9nh/4O4/9U9RGWVB49xo4ws= -go.opentelemetry.io/collector/processor v0.118.0/go.mod h1:Y8OD7wk51oPuBqrbn1qXIK91AbprRHP76hlvEzC24U4= -go.opentelemetry.io/collector/processor/batchprocessor v0.118.0 h1:odyJ9l5eakr+TS8sr6U9rz53QD5ZwewL/6pLUtFTJBs= -go.opentelemetry.io/collector/processor/batchprocessor v0.118.0/go.mod h1:fcHRefknjoLMpCRQ9LKEEzrrmSFUejEaTSxCqj5lHhI= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.118.0 h1:1v9VB9lJdo5kNT448Ba1jk9psS4+iv8clooiDU0/5WM= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.118.0/go.mod h1:UjlRdaLezSHt+5vX9erJu24HmTMw9mefQSQLatcSwG4= -go.opentelemetry.io/collector/processor/processorhelper/xprocessorhelper v0.118.0 h1:FAuXTUGtk82XDeNC2EIsK8Ad2I0GrbK9zLT6piwjNeA= -go.opentelemetry.io/collector/processor/processorhelper/xprocessorhelper v0.118.0/go.mod h1:F/sHViojq+fH2rEAJcPC/o71EE5aFAideVkVBu59e9k= -go.opentelemetry.io/collector/processor/processortest v0.118.0 h1:VfTLHuIaJWGyUmrvAOvf63gPMf1vAW68/jtJClEsKtU= -go.opentelemetry.io/collector/processor/processortest v0.118.0/go.mod h1:ZFWxsSoafGNOEk83FtGz43M5ypUzAOvGnfT0aQTDHdU= -go.opentelemetry.io/collector/processor/xprocessor v0.118.0 h1:M/EMhPRbadHLpv7g99fBjfgyuYexBZmgQqb2vjTXjvM= -go.opentelemetry.io/collector/processor/xprocessor v0.118.0/go.mod h1:lkoQoCv2Cz+C0kf2VHgBUDYWDecZLLeaHEvHDXbBCXU= -go.opentelemetry.io/collector/receiver v0.118.0 h1:X4mspHmbbtwdCQZ7o370kNmdWfxRnK1FrsvEShCCKEc= -go.opentelemetry.io/collector/receiver v0.118.0/go.mod h1:wFyfu6sgrkDPLQoGOGMuChGZzkZnYcI/tPJWV4CRTzs= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.118.0 h1:Nud8aaRDb86K2kBeqMTjqAKDUV00JDn+G4wUZ3hDlAk= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.118.0/go.mod h1:MJvDEzWJnm1FMoIoTKmhlT3pPmwJP+65GKWy0lAzd30= -go.opentelemetry.io/collector/receiver/receivertest v0.118.0 h1:XlMr2mPsyXJsMUOqCpEoY3uCPsLZQbNA5fmVNDGB7Bw= -go.opentelemetry.io/collector/receiver/receivertest v0.118.0/go.mod h1:dtu/H1RNjhy11hTVf/XUfc02uGufMhYYdhhYBbglcUg= -go.opentelemetry.io/collector/receiver/xreceiver v0.118.0 h1:dzECve9e0H3ot0JWnWPuQr9Y84RhOYSd0+CjvJskx7Y= -go.opentelemetry.io/collector/receiver/xreceiver v0.118.0/go.mod h1:Lv1nD/mSYSP64iV8k+C+mWWZZOMLRubv9d1SUory3/E= -go.opentelemetry.io/collector/scraper v0.118.0 h1:944QgQVZ7PM0L9WIwgRPY0LbbHX5qsk2x4uxDO1IOAQ= -go.opentelemetry.io/collector/scraper v0.118.0/go.mod h1:wIa4bIqiU9bkeg3v5QQybwz1+K5DjrP1Afc13Kt22Cw= -go.opentelemetry.io/collector/scraper/scraperhelper v0.118.0 h1:kZu4TgGGSWlNP9ogVr3pVQGX6J/P8ooPj8wMH5+aWyQ= -go.opentelemetry.io/collector/scraper/scraperhelper v0.118.0/go.mod h1:NKOcwL580ycua1HQ9K3OUucBsMsVL5DbvOJxGtg4chs= -go.opentelemetry.io/collector/scraper/scrapertest v0.118.0 h1:1zqF7Rs/RuvUITsxGJSDsvVZEqyDFW5xe1nvlNs2+HE= -go.opentelemetry.io/collector/scraper/scrapertest v0.118.0/go.mod h1:lUUX279TfqMQ63VdAdf/cpX4AUuMLPHS0hJcjfyzKkg= -go.opentelemetry.io/collector/semconv v0.118.0 h1:V4vlMIK7TIaemrrn2VawvQPwruIKpj7Xgw9P5+BL56w= -go.opentelemetry.io/collector/semconv v0.118.0/go.mod h1:N6XE8Q0JKgBN2fAhkUQtqK9LT7rEGR6+Wu/Rtbal1iI= -go.opentelemetry.io/collector/service v0.118.0 h1:acZ9LzUbEF5M3G7o5FgenPJVuuM2y8c4HW5JVm648L4= -go.opentelemetry.io/collector/service v0.118.0/go.mod h1:uw3cl3UtkAOrEr8UQV2lXKjyTIbhWxURaQec8kE+Pic= -go.opentelemetry.io/contrib/bridges/otelzap v0.6.0 h1:j8icMXyyqNf6HGuwlYhniPnVsbJIq7n+WirDu3VAJdQ= -go.opentelemetry.io/contrib/bridges/otelzap v0.6.0/go.mod h1:evIOZpl+kAlU5IsaYX2Siw+IbpacAZvXemVsgt70uvw= -go.opentelemetry.io/contrib/config v0.10.0 h1:2JknAzMaYjxrHkTnZh3eOme/Y2P5eHE2SWfhfV6Xd6c= -go.opentelemetry.io/contrib/config v0.10.0/go.mod h1:aND2M6/KfNkntI5cyvHriR/zvZgPf8j9yETdSmvpfmc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0 h1:PS8wXpbyaDJQ2VDHHncMe9Vct0Zn1fEjpsjrLxGJoSc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0/go.mod h1:HDBUsEjOuRC0EzKZ1bSaRGZWUBAzo+MhAcUUORSr4D0= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 h1:yd02MEjBdJkG3uabWP9apV+OuWRIXGDuJEUJbOHmCFU= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0/go.mod h1:umTcuxiv1n/s/S6/c2AT/g2CQ7u5C59sHDNmfSwgz7Q= -go.opentelemetry.io/contrib/propagators/b3 v1.31.0 h1:PQPXYscmwbCp76QDvO4hMngF2j8Bx/OTV86laEl8uqo= -go.opentelemetry.io/contrib/propagators/b3 v1.31.0/go.mod h1:jbqfV8wDdqSDrAYxVpXQnpM0XFMq2FtDesblJ7blOwQ= -go.opentelemetry.io/contrib/zpages v0.56.0 h1:W7vP6s3juzL5KiHpr41zLNmsJ0QAZudYu8ay0zGAoko= -go.opentelemetry.io/contrib/zpages v0.56.0/go.mod h1:IxPRP4TYHw9jLeaEOSDIiA9zmyJNZNO6sbW55iMvSXs= +go.opentelemetry.io/collector v0.119.0 h1:n8ltRLteaUKjyY3E+3JbiaPG4gwL2pjNIcUvXmRA0Ko= +go.opentelemetry.io/collector v0.119.0/go.mod h1:w+qO3hp/mLR2wL4v06MWonGcj4p2/kPSNcU3R7+06p8= +go.opentelemetry.io/collector/client v1.25.0 h1:7IS+b3Xm2ymgmQj9UbnZmVF4jIw6F7tQjJP7lFc+GoM= +go.opentelemetry.io/collector/client v1.25.0/go.mod h1:IPyOnO7K0ztuZOV1i+WXShvq4tpbLp45tTDdIDvlZvM= +go.opentelemetry.io/collector/component v0.119.0 h1:ZVp9myF1Bc4BLa1V4C15Jy/VpqKPPhvbxpe9pP1mPMc= +go.opentelemetry.io/collector/component v0.119.0/go.mod h1:wtuWxFl+Ky9E/5+t2FwHoLyADDiBFFDdx8fN3fEs0n8= +go.opentelemetry.io/collector/component/componentstatus v0.119.0 h1:H8isEInGaWhnDfuG1Ax663dlsPgF4aM20sgraM6HmSI= +go.opentelemetry.io/collector/component/componentstatus v0.119.0/go.mod h1:Hr7scHUFPhyT32IkzKq06cdhRH9jMKvnKbDVYRUEnqE= +go.opentelemetry.io/collector/component/componenttest v0.119.0 h1:nVlBmKSu56zO/qCcNgDYCQsRoWAL+NPkrkIPAbapdQM= +go.opentelemetry.io/collector/component/componenttest v0.119.0/go.mod h1:H6KVzLkNhB/deEijLcq91Kjgs9Oshx2ZsFAwaMcuTLs= +go.opentelemetry.io/collector/config/configauth v0.119.0 h1:w/Ln2l6TSgadtRLEZ7mlmOsW/6Q4ITIrjwxR7Tbnfzg= +go.opentelemetry.io/collector/config/configauth v0.119.0/go.mod h1:B3DFUBTSGdwAjxbWtY/tQ+03QwousCMLM9s26+Kb9Xw= +go.opentelemetry.io/collector/config/configcompression v1.25.0 h1:iYeeYiKbTQu9lqWDpszeAc5gRkWBImDrBVe7u5gnoqw= +go.opentelemetry.io/collector/config/configcompression v1.25.0/go.mod h1:LvYG00tbPTv0NOLoZN0wXq1F5thcxvukO8INq7xyfWU= +go.opentelemetry.io/collector/config/configgrpc v0.119.0 h1:h3Fn5xzGSeSC721rbBhZDxTY5Z1sSSqQRdjR2LXnUZM= +go.opentelemetry.io/collector/config/configgrpc v0.119.0/go.mod h1:JkPHSM0clFA2bD85zQ8DuEyH4BFiB+wCZbr1aqbCLkY= +go.opentelemetry.io/collector/config/confighttp v0.119.0 h1:slt4Msm2D4qdu2Nvy2E+ccgrAS0T64zl6eTuWiiCxGg= +go.opentelemetry.io/collector/config/confighttp v0.119.0/go.mod h1:Tnfo1UP1OZPVfvYriaP187aS3FHfwVXNLjBZ799AUFk= +go.opentelemetry.io/collector/config/confignet v1.25.0 h1:DteOIhwvXkmGhqggKU/s0qfjpVW21TGku1vM2S0xArY= +go.opentelemetry.io/collector/config/confignet v1.25.0/go.mod h1:ZppUH1hgUJOubawEsxsQ9MzEYFytqo2GnVSS7d4CVxc= +go.opentelemetry.io/collector/config/configopaque v1.25.0 h1:raFi+CC8Sn4KzKCPhtnnrnkDQ0eFzJCN8xJpQh9d1sU= +go.opentelemetry.io/collector/config/configopaque v1.25.0/go.mod h1:sW0t0iI/VfRL9VYX7Ik6XzVgPcR+Y5kejTLsYcMyDWs= +go.opentelemetry.io/collector/config/configretry v1.25.0 h1:PelzRkTJ9zGxwdJha7pPtvR91GrgL/OzkY/MwyXYRUE= +go.opentelemetry.io/collector/config/configretry v1.25.0/go.mod h1:cleBc9I0DIWpTiiHfu9v83FUaCTqcPXmebpLxjEIqro= +go.opentelemetry.io/collector/config/configtelemetry v0.119.0 h1:gAgMUEVXZKgpASxOrhS55DyA/aYatq0U6gitZI8MLXw= +go.opentelemetry.io/collector/config/configtelemetry v0.119.0/go.mod h1:SlBEwQg0qly75rXZ6W1Ig8jN25KBVBkFIIAUI1GiAAE= +go.opentelemetry.io/collector/config/configtls v1.25.0 h1:x915Us8mhYWGB025LBMH8LT9ZPdvg2WKAyCQ7IDUSfw= +go.opentelemetry.io/collector/config/configtls v1.25.0/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= +go.opentelemetry.io/collector/confmap v1.25.0 h1:dLqd6hF4JqcDHl5GWWhc2jXsHs3hkq3KPvU/2Nw5aN4= +go.opentelemetry.io/collector/confmap v1.25.0/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/provider/envprovider v1.25.0 h1:r4nyEXzs+1ZaemXX7bo2pniIqUZxoFKv0Q1Y7UKkkeY= +go.opentelemetry.io/collector/confmap/provider/envprovider v1.25.0/go.mod h1:uIRrCsNI9hx6/AehW0MpB0oEPzRt2QIn6rCbFQkBbbQ= +go.opentelemetry.io/collector/confmap/provider/fileprovider v1.25.0 h1:0Bbay2ow6eQVKMxuota2i1/iIMRhE988hxoY/67Zfqw= +go.opentelemetry.io/collector/confmap/provider/fileprovider v1.25.0/go.mod h1:5xaAHjqx9mlcXxDCeUrZXkEfWk9suMqMKspK41XNelc= +go.opentelemetry.io/collector/confmap/provider/httpprovider v1.25.0 h1:eBuy2cxEuRRe5xhQjz+0YqCtMEa6pUUXtEUeZ1+dqSw= +go.opentelemetry.io/collector/confmap/provider/httpprovider v1.25.0/go.mod h1:tAn9Ahbs+y/lBv0etEnVg401hhiHGIXneALyD2I3qIs= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.25.0 h1:P0F4ys5mxyoo9Bl1uNQc9tDQHUcjc6UiSdQWnHzAod8= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.25.0/go.mod h1:3+woatuB5xT10fnmHu5DPujf/rBVi2sntNu2cjqFtYs= +go.opentelemetry.io/collector/connector v0.119.0 h1:TWEVa2Iu+YOW/BuqNAoX0iesv4ygocb9v6GKtZEGsSw= +go.opentelemetry.io/collector/connector v0.119.0/go.mod h1:4p/m2G2acL03RjhdeTJpo6afHFnfBU8E+eUxyrz7qd4= +go.opentelemetry.io/collector/connector/connectortest v0.119.0 h1:jfkxP4jrd+CkyM0SnOrwiSiOW0xyahsyUjWqMwVBbBI= +go.opentelemetry.io/collector/connector/connectortest v0.119.0/go.mod h1:W0jLFVqxpWE+Rz6+JoYY6wN6f41862n8PIr+igaECcI= +go.opentelemetry.io/collector/connector/forwardconnector v0.119.0 h1:tLehtkZwJkMeUqdYgNWIBRlFIbAdpJa9Mebp30Lwv6o= +go.opentelemetry.io/collector/connector/forwardconnector v0.119.0/go.mod h1:WfvfJdGiAvJLLv5SY8yGHyvq3ktBsAIgBP0FM9W1M/Q= +go.opentelemetry.io/collector/connector/xconnector v0.119.0 h1:00iGiSVJKp82WjWsyPCMfxmyTynGzNkr7dSrb4oMuyQ= +go.opentelemetry.io/collector/connector/xconnector v0.119.0/go.mod h1:8MPaHhN64/METupujKMxuX+2eixLduUHXxMqP4JUUpc= +go.opentelemetry.io/collector/consumer v1.25.0 h1:qCJa7Hh7lY3vYWgwcEgTGSjjITLCn+BSsya8LxjpoPY= +go.opentelemetry.io/collector/consumer v1.25.0/go.mod h1:ToBfr3BexnhHuxC8/XszkKP/YtkgsGd0yjFMQXNwvT8= +go.opentelemetry.io/collector/consumer/consumererror v0.119.0 h1:M6QXK3KLWnNLlUWOBgz+WQI//W9M8r9qVGWUA3mc5LM= +go.opentelemetry.io/collector/consumer/consumererror v0.119.0/go.mod h1:UNnNkr+ZQJhAMNE5v1n86lXbJrSYb+1ePcI98gV6xvo= +go.opentelemetry.io/collector/consumer/consumererror/xconsumererror v0.119.0 h1:T/H7NcNIPKnCPlM5rObxPR+907ayTTXnyWiuMjL7Hsg= +go.opentelemetry.io/collector/consumer/consumererror/xconsumererror v0.119.0/go.mod h1:k03ncJ8V0QFKqwD4ELNyvFx3pMs2uaCErbIn06N9YLo= +go.opentelemetry.io/collector/consumer/consumertest v0.119.0 h1:hZxdlvfOBzy/rl6mIyrannM4M+7zyv7C947f6W9Leio= +go.opentelemetry.io/collector/consumer/consumertest v0.119.0/go.mod h1:pfXxA2CCwbieymnX0ShZuHjwrWzmxJapsb8ZiSqojVc= +go.opentelemetry.io/collector/consumer/xconsumer v0.119.0 h1:s9DrRdb1kYXy2psr34zGG5sI+F4GRBIhjvEsh7C7FtE= +go.opentelemetry.io/collector/consumer/xconsumer v0.119.0/go.mod h1:3fvk+0hd4WMv76+oUUNah0rQ35dZzH3zyMMCg9MtsuY= +go.opentelemetry.io/collector/exporter v0.119.0 h1:eVHmkeB5HQY/FcoP62l7O4Q0cAZ97LwLhZiAQoQeBtU= +go.opentelemetry.io/collector/exporter v0.119.0/go.mod h1:xMF9mT01tXHX2NjfMRV8o9YyhPBZOR4Wt+srkTy1thM= +go.opentelemetry.io/collector/exporter/debugexporter v0.119.0 h1:T645QvdoiTWq8h4xf93PFCskjhlTEkCq+lvCwY/xpw0= +go.opentelemetry.io/collector/exporter/debugexporter v0.119.0/go.mod h1:+NpJwrP28x2WvhDMjR3aMaHiFis7gRbLFfSowW5F3jM= +go.opentelemetry.io/collector/exporter/exporterhelper/xexporterhelper v0.119.0 h1:KS7W2zWVd34Q0BF6tek0hXNEhWHxTr84O+u4xG6a7FM= +go.opentelemetry.io/collector/exporter/exporterhelper/xexporterhelper v0.119.0/go.mod h1:eKijsOVkLOuu9lbqx86Mua8PqURnpxOdPo/5grKGHOg= +go.opentelemetry.io/collector/exporter/exportertest v0.119.0 h1:saABJIiyYyqWEBvGe2VVf5rMMpHdwB83nD6feNZ33nA= +go.opentelemetry.io/collector/exporter/exportertest v0.119.0/go.mod h1:S82pMkj1gWdivxVRKqaRJvGMgVRntKVI5dWAgs23KI8= +go.opentelemetry.io/collector/exporter/nopexporter v0.119.0 h1:xMFnJMkqkzcy9QtfoT/K/UdluLs76Ayrd0XlXcVKMLI= +go.opentelemetry.io/collector/exporter/nopexporter v0.119.0/go.mod h1:8fkzPooeLOkMJiD52zJ9BffvedLi9FH+pOgPBLk1pSE= +go.opentelemetry.io/collector/exporter/otlpexporter v0.119.0 h1:+Ic7h40EOUPbgDnJzVRns5IjxQBKP8Svn4VeIu1Cnj4= +go.opentelemetry.io/collector/exporter/otlpexporter v0.119.0/go.mod h1:TZMlSFncZ6w7NwEEwElB5QGUNIYZb2SMfmUVajxTctw= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.119.0 h1:Hyld/aXva2sPrTchpL9w6QmJVekQcgAO4c3mNbDMi78= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.119.0/go.mod h1:U3S1yKDcyb0pP7Xs/SGWWBw4nEzW1KIoBtzYn3CE5TY= +go.opentelemetry.io/collector/exporter/xexporter v0.119.0 h1:bCUFRa/of+iPrJoXyzJ5cbOv/hWDHw87bnDRFQJ/JVU= +go.opentelemetry.io/collector/exporter/xexporter v0.119.0/go.mod h1:naV2XoiJv8bvOt7Vs9h6aDWmJnuD1SRnDqkIFRINYlI= +go.opentelemetry.io/collector/extension v0.119.0 h1:Itkt3jqYLjkhoX4kWhICuhXQEQz332W7UL6DpmaNHMc= +go.opentelemetry.io/collector/extension v0.119.0/go.mod h1:yMpvs58Z9F3UpSoE4w/1q/EEKlLFZBOQ2muzzikRvO8= +go.opentelemetry.io/collector/extension/auth v0.119.0 h1:URPkjeo3aKmlYGgeFCZK6kLK+D1XGfDUGSAwFaHn+QQ= +go.opentelemetry.io/collector/extension/auth v0.119.0/go.mod h1:8mGcTLfgmf2QNrdumP7g7nnNtyrpHiPRZect1tdXYJQ= +go.opentelemetry.io/collector/extension/auth/authtest v0.119.0 h1:J3oqlamxI+1BvRSxFIOkjMZl2E534YM6y3O8seM0yzE= +go.opentelemetry.io/collector/extension/auth/authtest v0.119.0/go.mod h1:EpUkiFC9siKB/PXeTk9KFutJhZrd6I/AHBM5en4yXlM= +go.opentelemetry.io/collector/extension/extensioncapabilities v0.119.0 h1:OgG2AW0Ra43tbWDUOMC4TRIUXiz5PsVYNhnBtW3muk0= +go.opentelemetry.io/collector/extension/extensioncapabilities v0.119.0/go.mod h1:e+5w+yz9d0KHBZcH1T204IGfEO4IWuAltCSh9L5i8wg= +go.opentelemetry.io/collector/extension/extensiontest v0.119.0 h1:sAdIBRJ6Df7jdkHWY/pSEYTersxURkUz9pENKl73n6s= +go.opentelemetry.io/collector/extension/extensiontest v0.119.0/go.mod h1:XQbUTXneJ//xt58eu5ofHhzWQcQ24GRTbBMWHCEsipA= +go.opentelemetry.io/collector/extension/xextension v0.119.0 h1:uSUvha4yxk5jWevhepsQ56QSAOkk3Z4M0vcPEJeZ6UU= +go.opentelemetry.io/collector/extension/xextension v0.119.0/go.mod h1:2DSTP2IEFfCC+2IFzl1eG9bCKsBkxIQjIphziJ0+vuo= +go.opentelemetry.io/collector/extension/zpagesextension v0.119.0 h1:NUmze3n47EhqWwM/GA0o98OFntsYialinKJABRw2Ri4= +go.opentelemetry.io/collector/extension/zpagesextension v0.119.0/go.mod h1:M2zapnlbhlJbuLU7edsDfokszyDIrqrOpIt0IEWxcJ8= +go.opentelemetry.io/collector/featuregate v1.25.0 h1:3b857fvoY9xBcE5qtLUE1/nlQ65teuW9d8CKr6MykYc= +go.opentelemetry.io/collector/featuregate v1.25.0/go.mod h1:3GaXqflNDVwWndNGBJ1+XJFy3Fv/XrFgjMN60N3z7yg= +go.opentelemetry.io/collector/filter v0.119.0 h1:uAoF9h7iTHlQE/AnIborqUwwT+Qtw+UnXfr4vEkzY0o= +go.opentelemetry.io/collector/filter v0.119.0/go.mod h1:mRiDt6ZAi+uN11FBwQ8z86k/SBn3PMwzP46cGz2thEc= +go.opentelemetry.io/collector/internal/fanoutconsumer v0.119.0 h1:egWfZjmGZRZ7a/LRJZQWs7MzlpHVo+jctdO+5jHigH8= +go.opentelemetry.io/collector/internal/fanoutconsumer v0.119.0/go.mod h1:0qxt8Lql6prWxCHAl4WguY+sdgyr20imKLgD/M/trjs= +go.opentelemetry.io/collector/internal/memorylimiter v0.119.0 h1:AMqZlXLyTk8hvuqiBLfVdVrwy/fSpWUbOCapOk43JoE= +go.opentelemetry.io/collector/internal/memorylimiter v0.119.0/go.mod h1:Kcawdd/CMNlaATPd0CYpSv2QXFvpDtuys68rLXTEOlM= +go.opentelemetry.io/collector/internal/sharedcomponent v0.119.0 h1:A2Pzo2fLewBLyV9CrcUzLMiN63A9WpKsL8QtELU/CCg= +go.opentelemetry.io/collector/internal/sharedcomponent v0.119.0/go.mod h1:r29B+4G7yswJ0JkE+yWH4knPvlBvxIgNuOx6p010u/A= +go.opentelemetry.io/collector/otelcol v0.119.0 h1:tHCo07NuSBtl3bPdYIVR78+9XKr/DqX2azPt5/QlcYM= +go.opentelemetry.io/collector/otelcol v0.119.0/go.mod h1:V4uiDdOk8dOVKH0NfTBofvxGtVgx53YrYvv4w+w2wwI= +go.opentelemetry.io/collector/otelcol/otelcoltest v0.119.0 h1:XicJhy+owMv1KqQZJSYMtWmuWeBd8ZavsItKO6whAr0= +go.opentelemetry.io/collector/otelcol/otelcoltest v0.119.0/go.mod h1:LY+jvqMARsOtJriH9gAfAYNg8bHA2G6H9mJI5IdT5x0= +go.opentelemetry.io/collector/pdata v1.25.0 h1:AmgBklQfbfy0lT8qsoJtRuYMZ7ZV3VZvkvhjSDentrg= +go.opentelemetry.io/collector/pdata v1.25.0/go.mod h1:Zs7D4RXOGS7E2faGc/jfWdbmhoiHBxA7QbpuJOioxq8= +go.opentelemetry.io/collector/pdata/pprofile v0.119.0 h1:sVtv/MhQ3NDLkgHOWDF9BdTtThNyXdOUiz5+poRkYLQ= +go.opentelemetry.io/collector/pdata/pprofile v0.119.0/go.mod h1:ur4388PjUpmwG5HoSMzrLCPkR0gNVLT4lekcJMRPt8A= +go.opentelemetry.io/collector/pdata/testdata v0.119.0 h1:a3OiuLYx7CaEQQ8LxMhPIM804eIGlNM6Pd0XoACXWMI= +go.opentelemetry.io/collector/pdata/testdata v0.119.0/go.mod h1:stCgL1fKOVp93mI4ocHy/xBMhkW3TXr8VetH4X86q8g= +go.opentelemetry.io/collector/pipeline v0.119.0 h1:NebdPIOBIzU7CdOE36hNrCrUML+XOTR9Zsoy43E7MVk= +go.opentelemetry.io/collector/pipeline v0.119.0/go.mod h1:qE3DmoB05AW0C3lmPvdxZqd/H4po84NPzd5MrqgtL74= +go.opentelemetry.io/collector/pipeline/xpipeline v0.119.0 h1:lX70c+MjXHbOJahU6Xs3yV1rPTV/7bWXlCj/C+CnMLc= +go.opentelemetry.io/collector/pipeline/xpipeline v0.119.0/go.mod h1:m2acg7G5Rb8Srm5aK4rD7mUDQhd1r/qXq1DJxdhMAcQ= +go.opentelemetry.io/collector/processor v0.119.0 h1:mqmdR/f4I/ud2jwODqwPZvJk/TCU+AjoCAyattyKXmE= +go.opentelemetry.io/collector/processor v0.119.0/go.mod h1:N0XxvcnM1EYmZ/NiGNsFpi3bEzZ9+C6bVZKDa7tUduw= +go.opentelemetry.io/collector/processor/batchprocessor v0.119.0 h1:Pu9LZry4SPuC9z9wmv1Sd+LQhLLIV0FD+TDVM3UHcww= +go.opentelemetry.io/collector/processor/batchprocessor v0.119.0/go.mod h1:yiyXOAw+O2/j8YrlHWntZM0+D2CKPJ8AUQpXFyfjYCU= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.119.0 h1:SELqVDUuzQNiLWYbXT/B9KGBlOxRPlvC1ImuyNOU6qY= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.119.0/go.mod h1:aXoBlLNh0Shg+gR3aM+5YD7fQUojakuWKU4I/COYZ9g= +go.opentelemetry.io/collector/processor/processorhelper/xprocessorhelper v0.119.0 h1:4WycsCvkb354qnD28Pt734l3UWfNDL+Ak4EQE8cG4JA= +go.opentelemetry.io/collector/processor/processorhelper/xprocessorhelper v0.119.0/go.mod h1:gKTFrNsq2Y9YSiUWYaBnNUSqyBytmMif0za1MzQht44= +go.opentelemetry.io/collector/processor/processortest v0.119.0 h1:0/mWuyDvELipmEIMVscOAy1vAcwUttym8yb+KLOJXmc= +go.opentelemetry.io/collector/processor/processortest v0.119.0/go.mod h1:JGqoUDWC3aFbyPbpZbdvTTDssvR7Rgfpf72VY5FeDHw= +go.opentelemetry.io/collector/processor/xprocessor v0.119.0 h1:qWWcMgde/2cLBg9MUQk0AcxC/aD34wz2GY3qrWeEHiw= +go.opentelemetry.io/collector/processor/xprocessor v0.119.0/go.mod h1:ZYtJGcZSDEB54vzulS8jdlYBpPbjklEODaVRc27TlxE= +go.opentelemetry.io/collector/receiver v0.119.0 h1:ZatoS4POR+XDkN1WwAv18Ism9f/FUsIjtVT4MIZbQS0= +go.opentelemetry.io/collector/receiver v0.119.0/go.mod h1:JUSsVwyKKQVD/Fy3T98OHOlVHE15Z7juba5RQzG3AXc= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.119.0 h1:opx0DmIFTI61hm7dLiAlLJ/+JxY9/gjYnPpfEob0m3U= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.119.0/go.mod h1:kgzvqb2lgZyREX4v16reRgqYPuhKOWtZFGhkI9l6zTo= +go.opentelemetry.io/collector/receiver/receivertest v0.119.0 h1:thZkyftPCNit/m2bUUC+zaR1+hbXoSkCDtNN/vZIZSg= +go.opentelemetry.io/collector/receiver/receivertest v0.119.0/go.mod h1:DZM70vofnquGkQiTfT5ZSFZlohxANl9XOrVq9h5IKnc= +go.opentelemetry.io/collector/receiver/xreceiver v0.119.0 h1:ZcTO+h+r9TyR1XgMhA7FTSTV9RF+z/IDPrcRIg1l56U= +go.opentelemetry.io/collector/receiver/xreceiver v0.119.0/go.mod h1:AkoWhnYFMygK7Tlzez398ti20NqydX8wxPVWU86+baE= +go.opentelemetry.io/collector/scraper v0.119.0 h1:fn9tcIFPkBzmqCYAOqYu8Ly1ygER/EzNIpf+2taUPVs= +go.opentelemetry.io/collector/scraper v0.119.0/go.mod h1:svo1G6dWv7lLdagaa+aOq6bpSJ8F6vOxYHDkH7uNypg= +go.opentelemetry.io/collector/scraper/scraperhelper v0.119.0 h1:uRSZcOHRUgXwW4hkseXOhRmHBg5SW9rvDjG0XoBeWbs= +go.opentelemetry.io/collector/scraper/scraperhelper v0.119.0/go.mod h1:EmnOapVu/TaKsbqvo928UmphG0JcNuHZcJwPAHMD9/k= +go.opentelemetry.io/collector/scraper/scrapertest v0.119.0 h1:ROL6ZdFwb2DxRHb8jzjkc5JX0MutgR3xAZzPERzcA0U= +go.opentelemetry.io/collector/scraper/scrapertest v0.119.0/go.mod h1:Q46oBgzjB6Hkys4dmS1ZXzxD9w8VabNv+uvuzLnr5uc= +go.opentelemetry.io/collector/semconv v0.119.0 h1:xo+V3a7hnK0I6fxAWCXT8BIT1PCBYd4emolhoKSDUlI= +go.opentelemetry.io/collector/semconv v0.119.0/go.mod h1:N6XE8Q0JKgBN2fAhkUQtqK9LT7rEGR6+Wu/Rtbal1iI= +go.opentelemetry.io/collector/service v0.119.0 h1:AP2dFx7h0VslEJfc9dt8Bbbggm1iA1iUGLzahvAPZMk= +go.opentelemetry.io/collector/service v0.119.0/go.mod h1:p/kOqK7POtrT9Jz+tAx/UtzlzokSHhFyi7eAETRgmt8= +go.opentelemetry.io/contrib/bridges/otelzap v0.9.0 h1:f+xpAfhQTjR8beiSMe1bnT/25PkeyWmOcI+SjXWguNw= +go.opentelemetry.io/contrib/bridges/otelzap v0.9.0/go.mod h1:T1Z1jyS5FttgQoF6UcGhnM+gF9wU32B4lHO69nXw4FE= +go.opentelemetry.io/contrib/config v0.14.0 h1:QAG8uHNp5ZiCkpT7XggSmg5AyW1sA0LgypMoXgBB1+4= +go.opentelemetry.io/contrib/config v0.14.0/go.mod h1:77rDmFPqBae5jtQ2C78RuDTHz4P27C8LzoN0MZyumYQ= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0 h1:rgMkmiGfix9vFJDcDi1PK8WEQP4FLQwLDfhp5ZLpFeE= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0/go.mod h1:ijPqXp5P6IRRByFVVg9DY8P5HkxkHE5ARIa+86aXPf4= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 h1:CV7UdSGJt/Ao6Gp4CXckLxVRRsRgDHoI8XjbL3PDl8s= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0/go.mod h1:FRmFuRJfag1IZ2dPkHnEoSFVgTVPUd2qf5Vi69hLb8I= +go.opentelemetry.io/contrib/propagators/b3 v1.34.0 h1:9pQdCEvV/6RWQmag94D6rhU+A4rzUhYBEJ8bpscx5p8= +go.opentelemetry.io/contrib/propagators/b3 v1.34.0/go.mod h1:FwM71WS8i1/mAK4n48t0KU6qUS/OZRBgDrHZv3RlJ+w= +go.opentelemetry.io/contrib/zpages v0.59.0 h1:t0H5zUy8fifIhRuVwm2FrA/D70Kk10SSpAEvvbaNscw= +go.opentelemetry.io/contrib/zpages v0.59.0/go.mod h1:9wo+yUPvHnBQEzoHJ8R3nA/Q5rkef7HjtLlSFI0Tgrc= go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY= go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI= -go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.7.0 h1:mMOmtYie9Fx6TSVzw4W+NTpvoaS1JWWga37oI1a/4qQ= -go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.7.0/go.mod h1:yy7nDsMMBUkD+jeekJ36ur5f3jJIrmCwUrY67VFhNpA= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.32.0 h1:j7ZSD+5yn+lo3sGV69nW04rRR0jhYnBwjuX3r0HvnK0= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.32.0/go.mod h1:WXbYJTUaZXAbYd8lbgGuvih0yuCfOFC5RJoYnoLcGz8= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.32.0 h1:t/Qur3vKSkUCcDVaSumWF2PKHt85pc7fRvFuoVT8qFU= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.32.0/go.mod h1:Rl61tySSdcOJWoEgYZVtmnKdA0GeKrSqkHC1t+91CH8= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 h1:Vh5HayB/0HHfOQA7Ctx69E/Y/DcQSMPpKANYVMQ7fBA= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0/go.mod h1:cpgtDBaqD/6ok/UG0jT15/uKjAY8mRA53diogHBg3UI= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 h1:5pojmb1U1AogINhN3SurB+zm/nIcusopeBNp42f45QM= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0/go.mod h1:57gTHJSE5S1tqg+EKsLPlTWhpHMsWlVmer+LA926XiA= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.33.0 h1:wpMfgF8E1rkrT1Z6meFh1NDtownE9Ii3n3X2GJYjsaU= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.33.0/go.mod h1:wAy0T/dUbs468uOlkT31xjvqQgEVXv58BRFWEgn5v/0= -go.opentelemetry.io/otel/exporters/prometheus v0.55.0 h1:sSPw658Lk2NWAv74lkD3B/RSDb+xRFx46GjkrL3VUZo= -go.opentelemetry.io/otel/exporters/prometheus v0.55.0/go.mod h1:nC00vyCmQixoeaxF6KNyP42II/RHa9UdruK02qBmHvI= -go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.7.0 h1:TwmL3O3fRR80m8EshBrd8YydEZMcUCsZXzOUlnFohwM= -go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.7.0/go.mod h1:tH98dDv5KPmPThswbXA0fr0Lwfs+OhK8HgaCo7PjRrk= -go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.32.0 h1:SZmDnHcgp3zwlPBS2JX2urGYe/jBKEIT6ZedHRUyCz8= -go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.32.0/go.mod h1:fdWW0HtZJ7+jNpTKUR0GpMEDP69nR8YBJQxNiVCE3jk= -go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.33.0 h1:W5AWUn/IVe8RFb5pZx1Uh9Laf/4+Qmm4kJL5zPuvR+0= -go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.33.0/go.mod h1:mzKxJywMNBdEX8TSJais3NnsVZUaJ+bAy6UxPTng2vk= -go.opentelemetry.io/otel/log v0.8.0 h1:egZ8vV5atrUWUbnSsHn6vB8R21G2wrKqNiDt3iWertk= -go.opentelemetry.io/otel/log v0.8.0/go.mod h1:M9qvDdUTRCopJcGRKg57+JSQ9LgLBrwwfC32epk5NX8= +go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.10.0 h1:5dTKu4I5Dn4P2hxyW3l3jTaZx9ACgg0ECos1eAVrheY= +go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.10.0/go.mod h1:P5HcUI8obLrCCmM3sbVBohZFH34iszk/+CPWuakZWL8= +go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.10.0 h1:q/heq5Zh8xV1+7GoMGJpTxM2Lhq5+bFxB29tshuRuw0= +go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.10.0/go.mod h1:leO2CSTg0Y+LyvmR7Wm4pUxE8KAmaM2GCVx7O+RATLA= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.34.0 h1:ajl4QczuJVA2TU9W9AGw++86Xga/RKt//16z/yxPgdk= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.34.0/go.mod h1:Vn3/rlOJ3ntf/Q3zAI0V5lDnTbHGaUsNUeF6nZmm7pA= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.34.0 h1:opwv08VbCZ8iecIWs+McMdHRcAXzjAeda3uG2kI/hcA= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.34.0/go.mod h1:oOP3ABpW7vFHulLpE8aYtNBodrHhMTrvfxUXGvqm7Ac= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 h1:OeNbIYk/2C15ckl7glBlOBp5+WlYsOElzTNmiPW/x60= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0/go.mod h1:7Bept48yIeqxP2OZ9/AqIpYS94h2or0aB4FypJTc8ZM= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 h1:tgJ0uaNS4c98WRNUEx5U3aDlrDOI5Rs+1Vifcw4DJ8U= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0/go.mod h1:U7HYyW0zt/a9x5J1Kjs+r1f/d4ZHnYFclhYY2+YbeoE= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.34.0 h1:BEj3SPM81McUZHYjRS5pEgNgnmzGJ5tRpU5krWnV8Bs= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.34.0/go.mod h1:9cKLGBDzI/F3NoHLQGm4ZrYdIHsvGt6ej6hUowxY0J4= +go.opentelemetry.io/otel/exporters/prometheus v0.56.0 h1:GnCIi0QyG0yy2MrJLzVrIM7laaJstj//flf1zEJCG+E= +go.opentelemetry.io/otel/exporters/prometheus v0.56.0/go.mod h1:JQcVZtbIIPM+7SWBB+T6FK+xunlyidwLp++fN0sUaOk= +go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.10.0 h1:GKCEAZLEpEf78cUvudQdTg0aET2ObOZRB2HtXA0qPAI= +go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.10.0/go.mod h1:9/zqSWLCmHT/9Jo6fYeUDRRogOLL60ABLsHWS99lF8s= +go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.34.0 h1:czJDQwFrMbOr9Kk+BPo1y8WZIIFIK58SA1kykuVeiOU= +go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.34.0/go.mod h1:lT7bmsxOe58Tq+JIOkTQMCGXdu47oA+VJKLZHbaBKbs= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.34.0 h1:jBpDk4HAUsrnVO1FsfCfCOTEc/MkInJmvfCHYLFiT80= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.34.0/go.mod h1:H9LUIM1daaeZaz91vZcfeM0fejXPmgCYE8ZhzqfJuiU= +go.opentelemetry.io/otel/log v0.10.0 h1:1CXmspaRITvFcjA4kyVszuG4HjA61fPDxMb7q3BuyF0= +go.opentelemetry.io/otel/log v0.10.0/go.mod h1:PbVdm9bXKku/gL0oFfUF4wwsQsOPlpo4VEqjvxih+FM= go.opentelemetry.io/otel/metric v1.34.0 h1:+eTR3U0MyfWjRDhmFMxe2SsW64QrZ84AOhvqS7Y+PoQ= go.opentelemetry.io/otel/metric v1.34.0/go.mod h1:CEDrp0fy2D0MvkXE+dPV7cMi8tWZwX3dmaIhwPOaqHE= go.opentelemetry.io/otel/sdk v1.34.0 h1:95zS4k/2GOy069d321O8jWgYsW3MzVV+KuSPKp7Wr1A= go.opentelemetry.io/otel/sdk v1.34.0/go.mod h1:0e/pNiaMAqaykJGKbi+tSjWfNNHMTxoC9qANsCzbyxU= -go.opentelemetry.io/otel/sdk/log v0.7.0 h1:dXkeI2S0MLc5g0/AwxTZv6EUEjctiH8aG14Am56NTmQ= -go.opentelemetry.io/otel/sdk/log v0.7.0/go.mod h1:oIRXpW+WD6M8BuGj5rtS0aRu/86cbDV/dAfNaZBIjYM= +go.opentelemetry.io/otel/sdk/log v0.10.0 h1:lR4teQGWfeDVGoute6l0Ou+RpFqQ9vaPdrNJlST0bvw= +go.opentelemetry.io/otel/sdk/log v0.10.0/go.mod h1:A+V1UTWREhWAittaQEG4bYm4gAZa6xnvVu+xKrIRkzo= go.opentelemetry.io/otel/sdk/metric v1.34.0 h1:5CeK9ujjbFVL5c1PhLuStg1wxA7vQv7ce1EK0Gyvahk= go.opentelemetry.io/otel/sdk/metric v1.34.0/go.mod h1:jQ/r8Ze28zRKoNRdkjCZxfs6YvBTG1+YIqyFVFYec5w= go.opentelemetry.io/otel/trace v1.34.0 h1:+ouXS2V8Rd4hp4580a8q23bg0azF2nI8cqLYnC8mh/k= go.opentelemetry.io/otel/trace v1.34.0/go.mod h1:Svm7lSjQD7kG7KJ/MUHPVXSDGz2OX4h0M2jHBhmSfRE= -go.opentelemetry.io/proto/otlp v1.4.0 h1:TA9WRvW6zMwP+Ssb6fLoUIuirti1gGbP28GcKG1jgeg= -go.opentelemetry.io/proto/otlp v1.4.0/go.mod h1:PPBWZIP98o2ElSqI35IHfu7hIhSwvc5N38Jw8pXuGFY= +go.opentelemetry.io/proto/otlp v1.5.0 h1:xJvq7gMzB31/d406fB8U5CBdyQGw4P399D1aQWU/3i4= +go.opentelemetry.io/proto/otlp v1.5.0/go.mod h1:keN8WnHxOy8PG0rQZjJJ5A2ebUoafqWp0eVQ4yIXvJ4= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= @@ -1844,6 +1850,7 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= @@ -1894,6 +1901,7 @@ golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96b golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= @@ -1992,6 +2000,7 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210819135213-f52c844e1c1c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220627191245-f75cf1eec38b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -2102,6 +2111,7 @@ golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.8/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= @@ -2130,8 +2140,8 @@ google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0M google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= -google.golang.org/api v0.216.0 h1:xnEHy+xWFrtYInWPy8OdGFsyIfWJjtVnO39g7pz2BFY= -google.golang.org/api v0.216.0/go.mod h1:K9wzQMvWi47Z9IU7OgdOofvZuw75Ge3PPITImZR/UyI= +google.golang.org/api v0.219.0 h1:nnKIvxKs/06jWawp2liznTBnMRQBEPpGo7I+oEypTX0= +google.golang.org/api v0.219.0/go.mod h1:K6OmjGm+NtLrIkHxv1U3a0qIf/0JOvAHd5O/6AoyKYE= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -2170,12 +2180,12 @@ google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7Fc google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 h1:ToEetK57OidYuqD4Q5w+vfEnPvPpuTwedCNVohYJfNk= -google.golang.org/genproto v0.0.0-20241118233622-e639e219e697/go.mod h1:JJrvXBWRZaFMxBufik1a4RpFw4HhgVtBBWQeQgUj2cc= +google.golang.org/genproto v0.0.0-20250106144421-5f5ef82da422 h1:6GUHKGv2huWOHKmDXLMNE94q3fBDlEHI+oTRIZSebK0= +google.golang.org/genproto v0.0.0-20250106144421-5f5ef82da422/go.mod h1:1NPAxoesyw/SgLPqaUp9u1f9PWCLAk/jVmhx7gJZStg= google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f h1:gap6+3Gk41EItBuyi4XX/bp4oqJ3UwuIMl25yGinuAA= google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f/go.mod h1:Ic02D47M+zbarjYYUlK57y316f2MoN0gjAwI3f2S95o= -google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f h1:OxYkA3wjPsZyBylwymxSHa7ViiW1Sml4ToBrncvFehI= -google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f/go.mod h1:+2Yz8+CLJbIfL9z73EW45avw8Lmge3xVElCP9zEKi50= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250124145028-65684f501c47 h1:91mG8dNTpkC0uChJUQ9zCiRqx3GEEFOWaRZ0mI6Oj2I= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250124145028-65684f501c47/go.mod h1:+2Yz8+CLJbIfL9z73EW45avw8Lmge3xVElCP9zEKi50= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= @@ -2191,8 +2201,8 @@ google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3Iji google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.69.4 h1:MF5TftSMkd8GLw/m0KM6V8CMOCY6NZ1NQDPGFgbTt4A= -google.golang.org/grpc v1.69.4/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4= +google.golang.org/grpc v1.70.0 h1:pWFv03aZoHzlRKHWicjsZytKAiYCtNS0dHbXnIdq7jQ= +google.golang.org/grpc v1.70.0/go.mod h1:ofIJqVKDXx/JiXrwr2IG4/zwdH9txy3IlF40RmcJSQw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -2205,8 +2215,8 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.36.3 h1:82DV7MYdb8anAVi3qge1wSnMDrnKK7ebr+I0hHRN1BU= -google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/protobuf v1.36.4 h1:6A3ZDJHn/eNqc1i+IdefRzy/9PokBTPvcqMySR7NNIM= +google.golang.org/protobuf v1.36.4/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/collector/odigosotelcol/main.go b/collector/odigosotelcol/main.go index 3e2223ff97..161f766c52 100644 --- a/collector/odigosotelcol/main.go +++ b/collector/odigosotelcol/main.go @@ -17,7 +17,7 @@ func main() { info := component.BuildInfo{ Command: "odigosotelcol", Description: "OpenTelemetry Collector for Odigos", - Version: "0.118.0", + Version: "0.119.0", } set := otelcol.CollectorSettings{ @@ -30,6 +30,9 @@ func main() { envprovider.NewFactory(), }, }, + }, ProviderModules: map[string]string{ + odigosfileprovider.NewFactory().Create(confmap.ProviderSettings{}).Scheme(): "go.opentelemetry.io/collector/odigos/providers/odigosfileprovider v0.119.0", + envprovider.NewFactory().Create(confmap.ProviderSettings{}).Scheme(): "go.opentelemetry.io/collector/confmap/provider/envprovider v0.119.0", }, } diff --git a/collector/processors/odigosconditionalattributes/generated_component_test.go b/collector/processors/odigosconditionalattributes/generated_component_test.go index 0152f45853..a6f8935cac 100644 --- a/collector/processors/odigosconditionalattributes/generated_component_test.go +++ b/collector/processors/odigosconditionalattributes/generated_component_test.go @@ -32,8 +32,8 @@ func TestComponentLifecycle(t *testing.T) { factory := NewFactory() tests := []struct { - name string createFn func(ctx context.Context, set processor.Settings, cfg component.Config) (component.Component, error) + name string }{ { diff --git a/collector/processors/odigosconditionalattributes/go.mod b/collector/processors/odigosconditionalattributes/go.mod index 288a72ca86..e3cda12b80 100644 --- a/collector/processors/odigosconditionalattributes/go.mod +++ b/collector/processors/odigosconditionalattributes/go.mod @@ -4,14 +4,14 @@ go 1.23.0 require ( github.com/stretchr/testify v1.10.0 - go.opentelemetry.io/collector/component v0.118.0 - go.opentelemetry.io/collector/component/componenttest v0.118.0 - go.opentelemetry.io/collector/confmap v1.24.0 - go.opentelemetry.io/collector/consumer v1.24.0 - go.opentelemetry.io/collector/consumer/consumertest v0.118.0 - go.opentelemetry.io/collector/pdata v1.24.0 - go.opentelemetry.io/collector/processor v0.118.0 - go.opentelemetry.io/collector/processor/processortest v0.118.0 + go.opentelemetry.io/collector/component v0.119.0 + go.opentelemetry.io/collector/component/componenttest v0.119.0 + go.opentelemetry.io/collector/confmap v1.25.0 + go.opentelemetry.io/collector/consumer v1.25.0 + go.opentelemetry.io/collector/consumer/consumertest v0.119.0 + go.opentelemetry.io/collector/pdata v1.25.0 + go.opentelemetry.io/collector/processor v0.119.0 + go.opentelemetry.io/collector/processor/processortest v0.119.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -33,13 +33,13 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect go.opentelemetry.io/auto/sdk v1.1.0 // indirect - go.opentelemetry.io/collector/component/componentstatus v0.118.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.118.0 // indirect - go.opentelemetry.io/collector/consumer/xconsumer v0.118.0 // indirect - go.opentelemetry.io/collector/pdata/pprofile v0.118.0 // indirect - go.opentelemetry.io/collector/pdata/testdata v0.118.0 // indirect - go.opentelemetry.io/collector/pipeline v0.118.0 // indirect - go.opentelemetry.io/collector/processor/xprocessor v0.118.0 // indirect + go.opentelemetry.io/collector/component/componentstatus v0.119.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.119.0 // indirect + go.opentelemetry.io/collector/consumer/xconsumer v0.119.0 // indirect + go.opentelemetry.io/collector/pdata/pprofile v0.119.0 // indirect + go.opentelemetry.io/collector/pdata/testdata v0.119.0 // indirect + go.opentelemetry.io/collector/pipeline v0.119.0 // indirect + go.opentelemetry.io/collector/processor/xprocessor v0.119.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 @@ -50,7 +50,7 @@ require ( golang.org/x/sys v0.29.0 // indirect golang.org/x/text v0.21.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect - google.golang.org/grpc v1.69.4 // indirect - google.golang.org/protobuf v1.36.3 // indirect + google.golang.org/grpc v1.70.0 // indirect + google.golang.org/protobuf v1.36.4 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/collector/processors/odigosconditionalattributes/go.sum b/collector/processors/odigosconditionalattributes/go.sum index a6fce5b710..f17ed51a80 100644 --- a/collector/processors/odigosconditionalattributes/go.sum +++ b/collector/processors/odigosconditionalattributes/go.sum @@ -54,36 +54,36 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/collector/component v0.118.0 h1:sSO/ObxJ+yH77Z4DmT1mlSuxhbgUmY1ztt7xCA1F/8w= -go.opentelemetry.io/collector/component v0.118.0/go.mod h1:LUJ3AL2b+tmFr3hZol3hzKzCMvNdqNq0M5CF3SWdv4M= -go.opentelemetry.io/collector/component/componentstatus v0.118.0 h1:1aCIdUjqz0noKNQr1v04P+lwF89Lkua5U7BhH9IAxkE= -go.opentelemetry.io/collector/component/componentstatus v0.118.0/go.mod h1:ynO1Nyj0t1h6x/djIMJy35bhnnWEc2mlQaFgDNUO504= -go.opentelemetry.io/collector/component/componenttest v0.118.0 h1:knEHckoiL2fEWSIc0iehg39zP4IXzi9sHa45O+oxKo8= -go.opentelemetry.io/collector/component/componenttest v0.118.0/go.mod h1:aHc7t7zVwCpbhrWIWY+GMuaMxMCUP8C8P7pJOt8r/vU= -go.opentelemetry.io/collector/config/configtelemetry v0.118.0 h1:UlN46EViG2X42odWtXgWaqY7Y01ZKpsnswSwXTWx5mM= -go.opentelemetry.io/collector/config/configtelemetry v0.118.0/go.mod h1:SlBEwQg0qly75rXZ6W1Ig8jN25KBVBkFIIAUI1GiAAE= -go.opentelemetry.io/collector/confmap v1.24.0 h1:UUHVhkDCsVw14jPOarug9PDQE2vaB2ELPWMr7ARFBCA= -go.opentelemetry.io/collector/confmap v1.24.0/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= -go.opentelemetry.io/collector/consumer v1.24.0 h1:7DeyBm9qdr1EPuCfPjWyChPK16DbVc0wZeSa9LZprFU= -go.opentelemetry.io/collector/consumer v1.24.0/go.mod h1:0G6jvZprIp4dpKMD1ZxCjriiP9GdFvFMObsQEtTk71s= -go.opentelemetry.io/collector/consumer/consumertest v0.118.0 h1:8AAS9ejQapP1zqt0+cI6u+AUBheT3X0171N9WtXWsVY= -go.opentelemetry.io/collector/consumer/consumertest v0.118.0/go.mod h1:spRM2wyGr4QZzqMHlLmZnqRCxqXN4Wd0piogC4Qb5PQ= -go.opentelemetry.io/collector/consumer/xconsumer v0.118.0 h1:guWnzzRqgCInjnYlOQ1BPrimppNGIVvnknAjlIbWXuY= -go.opentelemetry.io/collector/consumer/xconsumer v0.118.0/go.mod h1:C5V2d6Ys/Fi6k3tzjBmbdZ9v3J/rZSAMlhx4KVcMIIg= -go.opentelemetry.io/collector/pdata v1.24.0 h1:D6j92eAzmAbQgivNBUnt8r9juOl8ugb+ihYynoFZIEg= -go.opentelemetry.io/collector/pdata v1.24.0/go.mod h1:cf3/W9E/uIvPS4MR26SnMFJhraUCattzzM6qusuONuc= -go.opentelemetry.io/collector/pdata/pprofile v0.118.0 h1:VK/fr65VFOwEhsSGRPj5c3lCv0yIK1Kt0sZxv9WZBb8= -go.opentelemetry.io/collector/pdata/pprofile v0.118.0/go.mod h1:eJyP/vBm179EghV3dPSnamGAWQwLyd+4z/3yG54YFoQ= -go.opentelemetry.io/collector/pdata/testdata v0.118.0 h1:5N0w1SX9KIRkwvtkrpzQgXy9eGk3vfNG0ds6mhEPMIM= -go.opentelemetry.io/collector/pdata/testdata v0.118.0/go.mod h1:UY+GHV5bOC1BnFburOZ0wiHReJj1XbW12mi2Ogbc5Lw= -go.opentelemetry.io/collector/pipeline v0.118.0 h1:RI1DMe7L0+5hGkx0EDGxG00TaJoh96MEQppgOlGx1Oc= -go.opentelemetry.io/collector/pipeline v0.118.0/go.mod h1:qE3DmoB05AW0C3lmPvdxZqd/H4po84NPzd5MrqgtL74= -go.opentelemetry.io/collector/processor v0.118.0 h1:NlqWiTTpPP+EPbrqTcNP9nh/4O4/9U9RGWVB49xo4ws= -go.opentelemetry.io/collector/processor v0.118.0/go.mod h1:Y8OD7wk51oPuBqrbn1qXIK91AbprRHP76hlvEzC24U4= -go.opentelemetry.io/collector/processor/processortest v0.118.0 h1:VfTLHuIaJWGyUmrvAOvf63gPMf1vAW68/jtJClEsKtU= -go.opentelemetry.io/collector/processor/processortest v0.118.0/go.mod h1:ZFWxsSoafGNOEk83FtGz43M5ypUzAOvGnfT0aQTDHdU= -go.opentelemetry.io/collector/processor/xprocessor v0.118.0 h1:M/EMhPRbadHLpv7g99fBjfgyuYexBZmgQqb2vjTXjvM= -go.opentelemetry.io/collector/processor/xprocessor v0.118.0/go.mod h1:lkoQoCv2Cz+C0kf2VHgBUDYWDecZLLeaHEvHDXbBCXU= +go.opentelemetry.io/collector/component v0.119.0 h1:ZVp9myF1Bc4BLa1V4C15Jy/VpqKPPhvbxpe9pP1mPMc= +go.opentelemetry.io/collector/component v0.119.0/go.mod h1:wtuWxFl+Ky9E/5+t2FwHoLyADDiBFFDdx8fN3fEs0n8= +go.opentelemetry.io/collector/component/componentstatus v0.119.0 h1:H8isEInGaWhnDfuG1Ax663dlsPgF4aM20sgraM6HmSI= +go.opentelemetry.io/collector/component/componentstatus v0.119.0/go.mod h1:Hr7scHUFPhyT32IkzKq06cdhRH9jMKvnKbDVYRUEnqE= +go.opentelemetry.io/collector/component/componenttest v0.119.0 h1:nVlBmKSu56zO/qCcNgDYCQsRoWAL+NPkrkIPAbapdQM= +go.opentelemetry.io/collector/component/componenttest v0.119.0/go.mod h1:H6KVzLkNhB/deEijLcq91Kjgs9Oshx2ZsFAwaMcuTLs= +go.opentelemetry.io/collector/config/configtelemetry v0.119.0 h1:gAgMUEVXZKgpASxOrhS55DyA/aYatq0U6gitZI8MLXw= +go.opentelemetry.io/collector/config/configtelemetry v0.119.0/go.mod h1:SlBEwQg0qly75rXZ6W1Ig8jN25KBVBkFIIAUI1GiAAE= +go.opentelemetry.io/collector/confmap v1.25.0 h1:dLqd6hF4JqcDHl5GWWhc2jXsHs3hkq3KPvU/2Nw5aN4= +go.opentelemetry.io/collector/confmap v1.25.0/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/consumer v1.25.0 h1:qCJa7Hh7lY3vYWgwcEgTGSjjITLCn+BSsya8LxjpoPY= +go.opentelemetry.io/collector/consumer v1.25.0/go.mod h1:ToBfr3BexnhHuxC8/XszkKP/YtkgsGd0yjFMQXNwvT8= +go.opentelemetry.io/collector/consumer/consumertest v0.119.0 h1:hZxdlvfOBzy/rl6mIyrannM4M+7zyv7C947f6W9Leio= +go.opentelemetry.io/collector/consumer/consumertest v0.119.0/go.mod h1:pfXxA2CCwbieymnX0ShZuHjwrWzmxJapsb8ZiSqojVc= +go.opentelemetry.io/collector/consumer/xconsumer v0.119.0 h1:s9DrRdb1kYXy2psr34zGG5sI+F4GRBIhjvEsh7C7FtE= +go.opentelemetry.io/collector/consumer/xconsumer v0.119.0/go.mod h1:3fvk+0hd4WMv76+oUUNah0rQ35dZzH3zyMMCg9MtsuY= +go.opentelemetry.io/collector/pdata v1.25.0 h1:AmgBklQfbfy0lT8qsoJtRuYMZ7ZV3VZvkvhjSDentrg= +go.opentelemetry.io/collector/pdata v1.25.0/go.mod h1:Zs7D4RXOGS7E2faGc/jfWdbmhoiHBxA7QbpuJOioxq8= +go.opentelemetry.io/collector/pdata/pprofile v0.119.0 h1:sVtv/MhQ3NDLkgHOWDF9BdTtThNyXdOUiz5+poRkYLQ= +go.opentelemetry.io/collector/pdata/pprofile v0.119.0/go.mod h1:ur4388PjUpmwG5HoSMzrLCPkR0gNVLT4lekcJMRPt8A= +go.opentelemetry.io/collector/pdata/testdata v0.119.0 h1:a3OiuLYx7CaEQQ8LxMhPIM804eIGlNM6Pd0XoACXWMI= +go.opentelemetry.io/collector/pdata/testdata v0.119.0/go.mod h1:stCgL1fKOVp93mI4ocHy/xBMhkW3TXr8VetH4X86q8g= +go.opentelemetry.io/collector/pipeline v0.119.0 h1:NebdPIOBIzU7CdOE36hNrCrUML+XOTR9Zsoy43E7MVk= +go.opentelemetry.io/collector/pipeline v0.119.0/go.mod h1:qE3DmoB05AW0C3lmPvdxZqd/H4po84NPzd5MrqgtL74= +go.opentelemetry.io/collector/processor v0.119.0 h1:mqmdR/f4I/ud2jwODqwPZvJk/TCU+AjoCAyattyKXmE= +go.opentelemetry.io/collector/processor v0.119.0/go.mod h1:N0XxvcnM1EYmZ/NiGNsFpi3bEzZ9+C6bVZKDa7tUduw= +go.opentelemetry.io/collector/processor/processortest v0.119.0 h1:0/mWuyDvELipmEIMVscOAy1vAcwUttym8yb+KLOJXmc= +go.opentelemetry.io/collector/processor/processortest v0.119.0/go.mod h1:JGqoUDWC3aFbyPbpZbdvTTDssvR7Rgfpf72VY5FeDHw= +go.opentelemetry.io/collector/processor/xprocessor v0.119.0 h1:qWWcMgde/2cLBg9MUQk0AcxC/aD34wz2GY3qrWeEHiw= +go.opentelemetry.io/collector/processor/xprocessor v0.119.0/go.mod h1:ZYtJGcZSDEB54vzulS8jdlYBpPbjklEODaVRc27TlxE= go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY= go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI= go.opentelemetry.io/otel/metric v1.34.0 h1:+eTR3U0MyfWjRDhmFMxe2SsW64QrZ84AOhvqS7Y+PoQ= @@ -133,10 +133,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-20250115164207-1a7da9e5054f h1:OxYkA3wjPsZyBylwymxSHa7ViiW1Sml4ToBrncvFehI= google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f/go.mod h1:+2Yz8+CLJbIfL9z73EW45avw8Lmge3xVElCP9zEKi50= -google.golang.org/grpc v1.69.4 h1:MF5TftSMkd8GLw/m0KM6V8CMOCY6NZ1NQDPGFgbTt4A= -google.golang.org/grpc v1.69.4/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4= -google.golang.org/protobuf v1.36.3 h1:82DV7MYdb8anAVi3qge1wSnMDrnKK7ebr+I0hHRN1BU= -google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/grpc v1.70.0 h1:pWFv03aZoHzlRKHWicjsZytKAiYCtNS0dHbXnIdq7jQ= +google.golang.org/grpc v1.70.0/go.mod h1:ofIJqVKDXx/JiXrwr2IG4/zwdH9txy3IlF40RmcJSQw= +google.golang.org/protobuf v1.36.4 h1:6A3ZDJHn/eNqc1i+IdefRzy/9PokBTPvcqMySR7NNIM= +google.golang.org/protobuf v1.36.4/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/collector/processors/odigosresourcenameprocessor/generated_component_test.go b/collector/processors/odigosresourcenameprocessor/generated_component_test.go index 52c7555ffa..fc8b96db82 100644 --- a/collector/processors/odigosresourcenameprocessor/generated_component_test.go +++ b/collector/processors/odigosresourcenameprocessor/generated_component_test.go @@ -32,8 +32,8 @@ func TestComponentLifecycle(t *testing.T) { factory := NewFactory() tests := []struct { - name string createFn func(ctx context.Context, set processor.Settings, cfg component.Config) (component.Component, error) + name string }{ { diff --git a/collector/processors/odigosresourcenameprocessor/go.mod b/collector/processors/odigosresourcenameprocessor/go.mod index a445bc78e2..2929ee9f32 100644 --- a/collector/processors/odigosresourcenameprocessor/go.mod +++ b/collector/processors/odigosresourcenameprocessor/go.mod @@ -3,22 +3,22 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/odigos/processo go 1.23.0 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.118.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.119.0 github.com/stretchr/testify v1.10.0 - go.opentelemetry.io/collector/component v0.118.0 - go.opentelemetry.io/collector/component/componenttest v0.118.0 - go.opentelemetry.io/collector/confmap v1.24.0 - go.opentelemetry.io/collector/consumer v1.24.0 - go.opentelemetry.io/collector/consumer/consumertest v0.118.0 - go.opentelemetry.io/collector/pdata v1.24.0 - go.opentelemetry.io/collector/processor v0.118.0 - go.opentelemetry.io/collector/processor/processortest v0.118.0 + go.opentelemetry.io/collector/component v0.119.0 + go.opentelemetry.io/collector/component/componenttest v0.119.0 + go.opentelemetry.io/collector/confmap v1.25.0 + go.opentelemetry.io/collector/consumer v1.25.0 + go.opentelemetry.io/collector/consumer/consumertest v0.119.0 + go.opentelemetry.io/collector/pdata v1.25.0 + go.opentelemetry.io/collector/processor v0.119.0 + go.opentelemetry.io/collector/processor/processortest v0.119.0 go.opentelemetry.io/otel v1.34.0 go.opentelemetry.io/otel/metric v1.34.0 go.opentelemetry.io/otel/trace v1.34.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 - google.golang.org/grpc v1.69.4 + google.golang.org/grpc v1.70.0 k8s.io/apimachinery v0.31.3 k8s.io/client-go v0.31.3 k8s.io/kubelet v0.26.1 @@ -57,13 +57,13 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/x448/float16 v0.8.4 // indirect go.opentelemetry.io/auto/sdk v1.1.0 // indirect - go.opentelemetry.io/collector/component/componentstatus v0.118.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.118.0 // indirect - go.opentelemetry.io/collector/consumer/xconsumer v0.118.0 // indirect - go.opentelemetry.io/collector/pdata/pprofile v0.118.0 // indirect - go.opentelemetry.io/collector/pdata/testdata v0.118.0 // indirect - go.opentelemetry.io/collector/pipeline v0.118.0 // indirect - go.opentelemetry.io/collector/processor/xprocessor v0.118.0 // indirect + go.opentelemetry.io/collector/component/componentstatus v0.119.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.119.0 // indirect + go.opentelemetry.io/collector/consumer/xconsumer v0.119.0 // indirect + go.opentelemetry.io/collector/pdata/pprofile v0.119.0 // indirect + go.opentelemetry.io/collector/pdata/testdata v0.119.0 // indirect + go.opentelemetry.io/collector/pipeline v0.119.0 // indirect + go.opentelemetry.io/collector/processor/xprocessor v0.119.0 // indirect go.opentelemetry.io/otel/sdk v1.34.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.34.0 // indirect go.uber.org/multierr v1.11.0 // indirect @@ -74,8 +74,8 @@ require ( golang.org/x/text v0.21.0 // indirect golang.org/x/time v0.4.0 // indirect golang.org/x/tools v0.28.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect - google.golang.org/protobuf v1.36.3 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20250124145028-65684f501c47 // indirect + google.golang.org/protobuf v1.36.4 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/collector/processors/odigosresourcenameprocessor/go.sum b/collector/processors/odigosresourcenameprocessor/go.sum index 7abedc2350..8793f602f0 100644 --- a/collector/processors/odigosresourcenameprocessor/go.sum +++ b/collector/processors/odigosresourcenameprocessor/go.sum @@ -337,8 +337,8 @@ github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGV github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.19.0 h1:4ieX6qQjPP/BfC3mpsAtIGGlxTWPeA3Inl/7DtXw1tw= github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.118.0 h1:94Xf/jV2ewqnVRA/CUKvNKZ5p3+mEtrMcPE1Xw9lk18= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.118.0/go.mod h1:GhC+Pk3PbAIq52vmYr+d6PN4Hnxyp4lGQMbomI7Bom8= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.119.0 h1:Rfn7AHN559aaxqKwFWlG36HuHlhl7dbIspKC/O1H8EQ= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.119.0/go.mod h1:GhC+Pk3PbAIq52vmYr+d6PN4Hnxyp4lGQMbomI7Bom8= github.com/openshift/api v0.0.0-20210521075222-e273a339932a/go.mod h1:izBmoXbUu3z5kUa4FjZhvekTsyzIWiOoaIgJiZBBMQs= github.com/openshift/api v3.9.0+incompatible h1:fJ/KsefYuZAjmrr3+5U9yZIZbTOpVkDDLDLFresAeYs= github.com/openshift/api v3.9.0+incompatible/go.mod h1:dh9o4Fs58gpFXGSYfnVxGR9PnV53I8TW84pQaJDdGiY= @@ -419,36 +419,36 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/collector/component v0.118.0 h1:sSO/ObxJ+yH77Z4DmT1mlSuxhbgUmY1ztt7xCA1F/8w= -go.opentelemetry.io/collector/component v0.118.0/go.mod h1:LUJ3AL2b+tmFr3hZol3hzKzCMvNdqNq0M5CF3SWdv4M= -go.opentelemetry.io/collector/component/componentstatus v0.118.0 h1:1aCIdUjqz0noKNQr1v04P+lwF89Lkua5U7BhH9IAxkE= -go.opentelemetry.io/collector/component/componentstatus v0.118.0/go.mod h1:ynO1Nyj0t1h6x/djIMJy35bhnnWEc2mlQaFgDNUO504= -go.opentelemetry.io/collector/component/componenttest v0.118.0 h1:knEHckoiL2fEWSIc0iehg39zP4IXzi9sHa45O+oxKo8= -go.opentelemetry.io/collector/component/componenttest v0.118.0/go.mod h1:aHc7t7zVwCpbhrWIWY+GMuaMxMCUP8C8P7pJOt8r/vU= -go.opentelemetry.io/collector/config/configtelemetry v0.118.0 h1:UlN46EViG2X42odWtXgWaqY7Y01ZKpsnswSwXTWx5mM= -go.opentelemetry.io/collector/config/configtelemetry v0.118.0/go.mod h1:SlBEwQg0qly75rXZ6W1Ig8jN25KBVBkFIIAUI1GiAAE= -go.opentelemetry.io/collector/confmap v1.24.0 h1:UUHVhkDCsVw14jPOarug9PDQE2vaB2ELPWMr7ARFBCA= -go.opentelemetry.io/collector/confmap v1.24.0/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= -go.opentelemetry.io/collector/consumer v1.24.0 h1:7DeyBm9qdr1EPuCfPjWyChPK16DbVc0wZeSa9LZprFU= -go.opentelemetry.io/collector/consumer v1.24.0/go.mod h1:0G6jvZprIp4dpKMD1ZxCjriiP9GdFvFMObsQEtTk71s= -go.opentelemetry.io/collector/consumer/consumertest v0.118.0 h1:8AAS9ejQapP1zqt0+cI6u+AUBheT3X0171N9WtXWsVY= -go.opentelemetry.io/collector/consumer/consumertest v0.118.0/go.mod h1:spRM2wyGr4QZzqMHlLmZnqRCxqXN4Wd0piogC4Qb5PQ= -go.opentelemetry.io/collector/consumer/xconsumer v0.118.0 h1:guWnzzRqgCInjnYlOQ1BPrimppNGIVvnknAjlIbWXuY= -go.opentelemetry.io/collector/consumer/xconsumer v0.118.0/go.mod h1:C5V2d6Ys/Fi6k3tzjBmbdZ9v3J/rZSAMlhx4KVcMIIg= -go.opentelemetry.io/collector/pdata v1.24.0 h1:D6j92eAzmAbQgivNBUnt8r9juOl8ugb+ihYynoFZIEg= -go.opentelemetry.io/collector/pdata v1.24.0/go.mod h1:cf3/W9E/uIvPS4MR26SnMFJhraUCattzzM6qusuONuc= -go.opentelemetry.io/collector/pdata/pprofile v0.118.0 h1:VK/fr65VFOwEhsSGRPj5c3lCv0yIK1Kt0sZxv9WZBb8= -go.opentelemetry.io/collector/pdata/pprofile v0.118.0/go.mod h1:eJyP/vBm179EghV3dPSnamGAWQwLyd+4z/3yG54YFoQ= -go.opentelemetry.io/collector/pdata/testdata v0.118.0 h1:5N0w1SX9KIRkwvtkrpzQgXy9eGk3vfNG0ds6mhEPMIM= -go.opentelemetry.io/collector/pdata/testdata v0.118.0/go.mod h1:UY+GHV5bOC1BnFburOZ0wiHReJj1XbW12mi2Ogbc5Lw= -go.opentelemetry.io/collector/pipeline v0.118.0 h1:RI1DMe7L0+5hGkx0EDGxG00TaJoh96MEQppgOlGx1Oc= -go.opentelemetry.io/collector/pipeline v0.118.0/go.mod h1:qE3DmoB05AW0C3lmPvdxZqd/H4po84NPzd5MrqgtL74= -go.opentelemetry.io/collector/processor v0.118.0 h1:NlqWiTTpPP+EPbrqTcNP9nh/4O4/9U9RGWVB49xo4ws= -go.opentelemetry.io/collector/processor v0.118.0/go.mod h1:Y8OD7wk51oPuBqrbn1qXIK91AbprRHP76hlvEzC24U4= -go.opentelemetry.io/collector/processor/processortest v0.118.0 h1:VfTLHuIaJWGyUmrvAOvf63gPMf1vAW68/jtJClEsKtU= -go.opentelemetry.io/collector/processor/processortest v0.118.0/go.mod h1:ZFWxsSoafGNOEk83FtGz43M5ypUzAOvGnfT0aQTDHdU= -go.opentelemetry.io/collector/processor/xprocessor v0.118.0 h1:M/EMhPRbadHLpv7g99fBjfgyuYexBZmgQqb2vjTXjvM= -go.opentelemetry.io/collector/processor/xprocessor v0.118.0/go.mod h1:lkoQoCv2Cz+C0kf2VHgBUDYWDecZLLeaHEvHDXbBCXU= +go.opentelemetry.io/collector/component v0.119.0 h1:ZVp9myF1Bc4BLa1V4C15Jy/VpqKPPhvbxpe9pP1mPMc= +go.opentelemetry.io/collector/component v0.119.0/go.mod h1:wtuWxFl+Ky9E/5+t2FwHoLyADDiBFFDdx8fN3fEs0n8= +go.opentelemetry.io/collector/component/componentstatus v0.119.0 h1:H8isEInGaWhnDfuG1Ax663dlsPgF4aM20sgraM6HmSI= +go.opentelemetry.io/collector/component/componentstatus v0.119.0/go.mod h1:Hr7scHUFPhyT32IkzKq06cdhRH9jMKvnKbDVYRUEnqE= +go.opentelemetry.io/collector/component/componenttest v0.119.0 h1:nVlBmKSu56zO/qCcNgDYCQsRoWAL+NPkrkIPAbapdQM= +go.opentelemetry.io/collector/component/componenttest v0.119.0/go.mod h1:H6KVzLkNhB/deEijLcq91Kjgs9Oshx2ZsFAwaMcuTLs= +go.opentelemetry.io/collector/config/configtelemetry v0.119.0 h1:gAgMUEVXZKgpASxOrhS55DyA/aYatq0U6gitZI8MLXw= +go.opentelemetry.io/collector/config/configtelemetry v0.119.0/go.mod h1:SlBEwQg0qly75rXZ6W1Ig8jN25KBVBkFIIAUI1GiAAE= +go.opentelemetry.io/collector/confmap v1.25.0 h1:dLqd6hF4JqcDHl5GWWhc2jXsHs3hkq3KPvU/2Nw5aN4= +go.opentelemetry.io/collector/confmap v1.25.0/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/consumer v1.25.0 h1:qCJa7Hh7lY3vYWgwcEgTGSjjITLCn+BSsya8LxjpoPY= +go.opentelemetry.io/collector/consumer v1.25.0/go.mod h1:ToBfr3BexnhHuxC8/XszkKP/YtkgsGd0yjFMQXNwvT8= +go.opentelemetry.io/collector/consumer/consumertest v0.119.0 h1:hZxdlvfOBzy/rl6mIyrannM4M+7zyv7C947f6W9Leio= +go.opentelemetry.io/collector/consumer/consumertest v0.119.0/go.mod h1:pfXxA2CCwbieymnX0ShZuHjwrWzmxJapsb8ZiSqojVc= +go.opentelemetry.io/collector/consumer/xconsumer v0.119.0 h1:s9DrRdb1kYXy2psr34zGG5sI+F4GRBIhjvEsh7C7FtE= +go.opentelemetry.io/collector/consumer/xconsumer v0.119.0/go.mod h1:3fvk+0hd4WMv76+oUUNah0rQ35dZzH3zyMMCg9MtsuY= +go.opentelemetry.io/collector/pdata v1.25.0 h1:AmgBklQfbfy0lT8qsoJtRuYMZ7ZV3VZvkvhjSDentrg= +go.opentelemetry.io/collector/pdata v1.25.0/go.mod h1:Zs7D4RXOGS7E2faGc/jfWdbmhoiHBxA7QbpuJOioxq8= +go.opentelemetry.io/collector/pdata/pprofile v0.119.0 h1:sVtv/MhQ3NDLkgHOWDF9BdTtThNyXdOUiz5+poRkYLQ= +go.opentelemetry.io/collector/pdata/pprofile v0.119.0/go.mod h1:ur4388PjUpmwG5HoSMzrLCPkR0gNVLT4lekcJMRPt8A= +go.opentelemetry.io/collector/pdata/testdata v0.119.0 h1:a3OiuLYx7CaEQQ8LxMhPIM804eIGlNM6Pd0XoACXWMI= +go.opentelemetry.io/collector/pdata/testdata v0.119.0/go.mod h1:stCgL1fKOVp93mI4ocHy/xBMhkW3TXr8VetH4X86q8g= +go.opentelemetry.io/collector/pipeline v0.119.0 h1:NebdPIOBIzU7CdOE36hNrCrUML+XOTR9Zsoy43E7MVk= +go.opentelemetry.io/collector/pipeline v0.119.0/go.mod h1:qE3DmoB05AW0C3lmPvdxZqd/H4po84NPzd5MrqgtL74= +go.opentelemetry.io/collector/processor v0.119.0 h1:mqmdR/f4I/ud2jwODqwPZvJk/TCU+AjoCAyattyKXmE= +go.opentelemetry.io/collector/processor v0.119.0/go.mod h1:N0XxvcnM1EYmZ/NiGNsFpi3bEzZ9+C6bVZKDa7tUduw= +go.opentelemetry.io/collector/processor/processortest v0.119.0 h1:0/mWuyDvELipmEIMVscOAy1vAcwUttym8yb+KLOJXmc= +go.opentelemetry.io/collector/processor/processortest v0.119.0/go.mod h1:JGqoUDWC3aFbyPbpZbdvTTDssvR7Rgfpf72VY5FeDHw= +go.opentelemetry.io/collector/processor/xprocessor v0.119.0 h1:qWWcMgde/2cLBg9MUQk0AcxC/aD34wz2GY3qrWeEHiw= +go.opentelemetry.io/collector/processor/xprocessor v0.119.0/go.mod h1:ZYtJGcZSDEB54vzulS8jdlYBpPbjklEODaVRc27TlxE= go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY= go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI= go.opentelemetry.io/otel/metric v1.34.0 h1:+eTR3U0MyfWjRDhmFMxe2SsW64QrZ84AOhvqS7Y+PoQ= @@ -711,8 +711,8 @@ google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfG google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f h1:OxYkA3wjPsZyBylwymxSHa7ViiW1Sml4ToBrncvFehI= -google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f/go.mod h1:+2Yz8+CLJbIfL9z73EW45avw8Lmge3xVElCP9zEKi50= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250124145028-65684f501c47 h1:91mG8dNTpkC0uChJUQ9zCiRqx3GEEFOWaRZ0mI6Oj2I= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250124145028-65684f501c47/go.mod h1:+2Yz8+CLJbIfL9z73EW45avw8Lmge3xVElCP9zEKi50= google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= @@ -725,8 +725,8 @@ google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8 google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.69.4 h1:MF5TftSMkd8GLw/m0KM6V8CMOCY6NZ1NQDPGFgbTt4A= -google.golang.org/grpc v1.69.4/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4= +google.golang.org/grpc v1.70.0 h1:pWFv03aZoHzlRKHWicjsZytKAiYCtNS0dHbXnIdq7jQ= +google.golang.org/grpc v1.70.0/go.mod h1:ofIJqVKDXx/JiXrwr2IG4/zwdH9txy3IlF40RmcJSQw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -738,8 +738,8 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.36.3 h1:82DV7MYdb8anAVi3qge1wSnMDrnKK7ebr+I0hHRN1BU= -google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/protobuf v1.36.4 h1:6A3ZDJHn/eNqc1i+IdefRzy/9PokBTPvcqMySR7NNIM= +google.golang.org/protobuf v1.36.4/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/collector/processors/odigossamplingprocessor/generated_component_test.go b/collector/processors/odigossamplingprocessor/generated_component_test.go index 01be3e6aaf..b24ce75360 100644 --- a/collector/processors/odigossamplingprocessor/generated_component_test.go +++ b/collector/processors/odigossamplingprocessor/generated_component_test.go @@ -32,8 +32,8 @@ func TestComponentLifecycle(t *testing.T) { factory := NewFactory() tests := []struct { - name string createFn func(ctx context.Context, set processor.Settings, cfg component.Config) (component.Component, error) + name string }{ { diff --git a/collector/processors/odigossamplingprocessor/go.mod b/collector/processors/odigossamplingprocessor/go.mod index 15ac01fbf7..b06a4e6891 100644 --- a/collector/processors/odigossamplingprocessor/go.mod +++ b/collector/processors/odigossamplingprocessor/go.mod @@ -5,14 +5,14 @@ go 1.23.0 require ( github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c github.com/stretchr/testify v1.10.0 - go.opentelemetry.io/collector/component v0.118.0 - go.opentelemetry.io/collector/component/componenttest v0.118.0 - go.opentelemetry.io/collector/confmap v1.24.0 - go.opentelemetry.io/collector/consumer v1.24.0 - go.opentelemetry.io/collector/consumer/consumertest v0.118.0 - go.opentelemetry.io/collector/pdata v1.24.0 - go.opentelemetry.io/collector/processor v0.118.0 - go.opentelemetry.io/collector/processor/processortest v0.118.0 + go.opentelemetry.io/collector/component v0.119.0 + go.opentelemetry.io/collector/component/componenttest v0.119.0 + go.opentelemetry.io/collector/confmap v1.25.0 + go.opentelemetry.io/collector/consumer v1.25.0 + go.opentelemetry.io/collector/consumer/consumertest v0.119.0 + go.opentelemetry.io/collector/pdata v1.25.0 + go.opentelemetry.io/collector/processor v0.119.0 + go.opentelemetry.io/collector/processor/processortest v0.119.0 go.opentelemetry.io/otel v1.34.0 go.opentelemetry.io/otel/metric v1.34.0 go.opentelemetry.io/otel/trace v1.34.0 @@ -36,21 +36,21 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect go.opentelemetry.io/auto/sdk v1.1.0 // indirect - go.opentelemetry.io/collector/component/componentstatus v0.118.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.118.0 // indirect - go.opentelemetry.io/collector/consumer/xconsumer v0.118.0 // indirect - go.opentelemetry.io/collector/pdata/pprofile v0.118.0 // indirect - go.opentelemetry.io/collector/pdata/testdata v0.118.0 // indirect - go.opentelemetry.io/collector/pipeline v0.118.0 // indirect - go.opentelemetry.io/collector/processor/xprocessor v0.118.0 // indirect + go.opentelemetry.io/collector/component/componentstatus v0.119.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.119.0 // indirect + go.opentelemetry.io/collector/consumer/xconsumer v0.119.0 // indirect + go.opentelemetry.io/collector/pdata/pprofile v0.119.0 // indirect + go.opentelemetry.io/collector/pdata/testdata v0.119.0 // indirect + go.opentelemetry.io/collector/pipeline v0.119.0 // indirect + go.opentelemetry.io/collector/processor/xprocessor v0.119.0 // indirect go.opentelemetry.io/otel/sdk v1.34.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.34.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.34.0 // indirect golang.org/x/sys v0.29.0 // indirect golang.org/x/text v0.21.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect - google.golang.org/grpc v1.69.4 // indirect - google.golang.org/protobuf v1.36.3 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20250124145028-65684f501c47 // indirect + google.golang.org/grpc v1.70.0 // indirect + google.golang.org/protobuf v1.36.4 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/collector/processors/odigossamplingprocessor/go.sum b/collector/processors/odigossamplingprocessor/go.sum index 8f8677b1c6..9f7ceb8df3 100644 --- a/collector/processors/odigossamplingprocessor/go.sum +++ b/collector/processors/odigossamplingprocessor/go.sum @@ -261,36 +261,36 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/collector/component v0.118.0 h1:sSO/ObxJ+yH77Z4DmT1mlSuxhbgUmY1ztt7xCA1F/8w= -go.opentelemetry.io/collector/component v0.118.0/go.mod h1:LUJ3AL2b+tmFr3hZol3hzKzCMvNdqNq0M5CF3SWdv4M= -go.opentelemetry.io/collector/component/componentstatus v0.118.0 h1:1aCIdUjqz0noKNQr1v04P+lwF89Lkua5U7BhH9IAxkE= -go.opentelemetry.io/collector/component/componentstatus v0.118.0/go.mod h1:ynO1Nyj0t1h6x/djIMJy35bhnnWEc2mlQaFgDNUO504= -go.opentelemetry.io/collector/component/componenttest v0.118.0 h1:knEHckoiL2fEWSIc0iehg39zP4IXzi9sHa45O+oxKo8= -go.opentelemetry.io/collector/component/componenttest v0.118.0/go.mod h1:aHc7t7zVwCpbhrWIWY+GMuaMxMCUP8C8P7pJOt8r/vU= -go.opentelemetry.io/collector/config/configtelemetry v0.118.0 h1:UlN46EViG2X42odWtXgWaqY7Y01ZKpsnswSwXTWx5mM= -go.opentelemetry.io/collector/config/configtelemetry v0.118.0/go.mod h1:SlBEwQg0qly75rXZ6W1Ig8jN25KBVBkFIIAUI1GiAAE= -go.opentelemetry.io/collector/confmap v1.24.0 h1:UUHVhkDCsVw14jPOarug9PDQE2vaB2ELPWMr7ARFBCA= -go.opentelemetry.io/collector/confmap v1.24.0/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= -go.opentelemetry.io/collector/consumer v1.24.0 h1:7DeyBm9qdr1EPuCfPjWyChPK16DbVc0wZeSa9LZprFU= -go.opentelemetry.io/collector/consumer v1.24.0/go.mod h1:0G6jvZprIp4dpKMD1ZxCjriiP9GdFvFMObsQEtTk71s= -go.opentelemetry.io/collector/consumer/consumertest v0.118.0 h1:8AAS9ejQapP1zqt0+cI6u+AUBheT3X0171N9WtXWsVY= -go.opentelemetry.io/collector/consumer/consumertest v0.118.0/go.mod h1:spRM2wyGr4QZzqMHlLmZnqRCxqXN4Wd0piogC4Qb5PQ= -go.opentelemetry.io/collector/consumer/xconsumer v0.118.0 h1:guWnzzRqgCInjnYlOQ1BPrimppNGIVvnknAjlIbWXuY= -go.opentelemetry.io/collector/consumer/xconsumer v0.118.0/go.mod h1:C5V2d6Ys/Fi6k3tzjBmbdZ9v3J/rZSAMlhx4KVcMIIg= -go.opentelemetry.io/collector/pdata v1.24.0 h1:D6j92eAzmAbQgivNBUnt8r9juOl8ugb+ihYynoFZIEg= -go.opentelemetry.io/collector/pdata v1.24.0/go.mod h1:cf3/W9E/uIvPS4MR26SnMFJhraUCattzzM6qusuONuc= -go.opentelemetry.io/collector/pdata/pprofile v0.118.0 h1:VK/fr65VFOwEhsSGRPj5c3lCv0yIK1Kt0sZxv9WZBb8= -go.opentelemetry.io/collector/pdata/pprofile v0.118.0/go.mod h1:eJyP/vBm179EghV3dPSnamGAWQwLyd+4z/3yG54YFoQ= -go.opentelemetry.io/collector/pdata/testdata v0.118.0 h1:5N0w1SX9KIRkwvtkrpzQgXy9eGk3vfNG0ds6mhEPMIM= -go.opentelemetry.io/collector/pdata/testdata v0.118.0/go.mod h1:UY+GHV5bOC1BnFburOZ0wiHReJj1XbW12mi2Ogbc5Lw= -go.opentelemetry.io/collector/pipeline v0.118.0 h1:RI1DMe7L0+5hGkx0EDGxG00TaJoh96MEQppgOlGx1Oc= -go.opentelemetry.io/collector/pipeline v0.118.0/go.mod h1:qE3DmoB05AW0C3lmPvdxZqd/H4po84NPzd5MrqgtL74= -go.opentelemetry.io/collector/processor v0.118.0 h1:NlqWiTTpPP+EPbrqTcNP9nh/4O4/9U9RGWVB49xo4ws= -go.opentelemetry.io/collector/processor v0.118.0/go.mod h1:Y8OD7wk51oPuBqrbn1qXIK91AbprRHP76hlvEzC24U4= -go.opentelemetry.io/collector/processor/processortest v0.118.0 h1:VfTLHuIaJWGyUmrvAOvf63gPMf1vAW68/jtJClEsKtU= -go.opentelemetry.io/collector/processor/processortest v0.118.0/go.mod h1:ZFWxsSoafGNOEk83FtGz43M5ypUzAOvGnfT0aQTDHdU= -go.opentelemetry.io/collector/processor/xprocessor v0.118.0 h1:M/EMhPRbadHLpv7g99fBjfgyuYexBZmgQqb2vjTXjvM= -go.opentelemetry.io/collector/processor/xprocessor v0.118.0/go.mod h1:lkoQoCv2Cz+C0kf2VHgBUDYWDecZLLeaHEvHDXbBCXU= +go.opentelemetry.io/collector/component v0.119.0 h1:ZVp9myF1Bc4BLa1V4C15Jy/VpqKPPhvbxpe9pP1mPMc= +go.opentelemetry.io/collector/component v0.119.0/go.mod h1:wtuWxFl+Ky9E/5+t2FwHoLyADDiBFFDdx8fN3fEs0n8= +go.opentelemetry.io/collector/component/componentstatus v0.119.0 h1:H8isEInGaWhnDfuG1Ax663dlsPgF4aM20sgraM6HmSI= +go.opentelemetry.io/collector/component/componentstatus v0.119.0/go.mod h1:Hr7scHUFPhyT32IkzKq06cdhRH9jMKvnKbDVYRUEnqE= +go.opentelemetry.io/collector/component/componenttest v0.119.0 h1:nVlBmKSu56zO/qCcNgDYCQsRoWAL+NPkrkIPAbapdQM= +go.opentelemetry.io/collector/component/componenttest v0.119.0/go.mod h1:H6KVzLkNhB/deEijLcq91Kjgs9Oshx2ZsFAwaMcuTLs= +go.opentelemetry.io/collector/config/configtelemetry v0.119.0 h1:gAgMUEVXZKgpASxOrhS55DyA/aYatq0U6gitZI8MLXw= +go.opentelemetry.io/collector/config/configtelemetry v0.119.0/go.mod h1:SlBEwQg0qly75rXZ6W1Ig8jN25KBVBkFIIAUI1GiAAE= +go.opentelemetry.io/collector/confmap v1.25.0 h1:dLqd6hF4JqcDHl5GWWhc2jXsHs3hkq3KPvU/2Nw5aN4= +go.opentelemetry.io/collector/confmap v1.25.0/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/consumer v1.25.0 h1:qCJa7Hh7lY3vYWgwcEgTGSjjITLCn+BSsya8LxjpoPY= +go.opentelemetry.io/collector/consumer v1.25.0/go.mod h1:ToBfr3BexnhHuxC8/XszkKP/YtkgsGd0yjFMQXNwvT8= +go.opentelemetry.io/collector/consumer/consumertest v0.119.0 h1:hZxdlvfOBzy/rl6mIyrannM4M+7zyv7C947f6W9Leio= +go.opentelemetry.io/collector/consumer/consumertest v0.119.0/go.mod h1:pfXxA2CCwbieymnX0ShZuHjwrWzmxJapsb8ZiSqojVc= +go.opentelemetry.io/collector/consumer/xconsumer v0.119.0 h1:s9DrRdb1kYXy2psr34zGG5sI+F4GRBIhjvEsh7C7FtE= +go.opentelemetry.io/collector/consumer/xconsumer v0.119.0/go.mod h1:3fvk+0hd4WMv76+oUUNah0rQ35dZzH3zyMMCg9MtsuY= +go.opentelemetry.io/collector/pdata v1.25.0 h1:AmgBklQfbfy0lT8qsoJtRuYMZ7ZV3VZvkvhjSDentrg= +go.opentelemetry.io/collector/pdata v1.25.0/go.mod h1:Zs7D4RXOGS7E2faGc/jfWdbmhoiHBxA7QbpuJOioxq8= +go.opentelemetry.io/collector/pdata/pprofile v0.119.0 h1:sVtv/MhQ3NDLkgHOWDF9BdTtThNyXdOUiz5+poRkYLQ= +go.opentelemetry.io/collector/pdata/pprofile v0.119.0/go.mod h1:ur4388PjUpmwG5HoSMzrLCPkR0gNVLT4lekcJMRPt8A= +go.opentelemetry.io/collector/pdata/testdata v0.119.0 h1:a3OiuLYx7CaEQQ8LxMhPIM804eIGlNM6Pd0XoACXWMI= +go.opentelemetry.io/collector/pdata/testdata v0.119.0/go.mod h1:stCgL1fKOVp93mI4ocHy/xBMhkW3TXr8VetH4X86q8g= +go.opentelemetry.io/collector/pipeline v0.119.0 h1:NebdPIOBIzU7CdOE36hNrCrUML+XOTR9Zsoy43E7MVk= +go.opentelemetry.io/collector/pipeline v0.119.0/go.mod h1:qE3DmoB05AW0C3lmPvdxZqd/H4po84NPzd5MrqgtL74= +go.opentelemetry.io/collector/processor v0.119.0 h1:mqmdR/f4I/ud2jwODqwPZvJk/TCU+AjoCAyattyKXmE= +go.opentelemetry.io/collector/processor v0.119.0/go.mod h1:N0XxvcnM1EYmZ/NiGNsFpi3bEzZ9+C6bVZKDa7tUduw= +go.opentelemetry.io/collector/processor/processortest v0.119.0 h1:0/mWuyDvELipmEIMVscOAy1vAcwUttym8yb+KLOJXmc= +go.opentelemetry.io/collector/processor/processortest v0.119.0/go.mod h1:JGqoUDWC3aFbyPbpZbdvTTDssvR7Rgfpf72VY5FeDHw= +go.opentelemetry.io/collector/processor/xprocessor v0.119.0 h1:qWWcMgde/2cLBg9MUQk0AcxC/aD34wz2GY3qrWeEHiw= +go.opentelemetry.io/collector/processor/xprocessor v0.119.0/go.mod h1:ZYtJGcZSDEB54vzulS8jdlYBpPbjklEODaVRc27TlxE= go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY= go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI= go.opentelemetry.io/otel/metric v1.34.0 h1:+eTR3U0MyfWjRDhmFMxe2SsW64QrZ84AOhvqS7Y+PoQ= @@ -420,8 +420,8 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98 google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f h1:OxYkA3wjPsZyBylwymxSHa7ViiW1Sml4ToBrncvFehI= -google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f/go.mod h1:+2Yz8+CLJbIfL9z73EW45avw8Lmge3xVElCP9zEKi50= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250124145028-65684f501c47 h1:91mG8dNTpkC0uChJUQ9zCiRqx3GEEFOWaRZ0mI6Oj2I= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250124145028-65684f501c47/go.mod h1:+2Yz8+CLJbIfL9z73EW45avw8Lmge3xVElCP9zEKi50= google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.22.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= @@ -430,8 +430,8 @@ google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQ google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.69.4 h1:MF5TftSMkd8GLw/m0KM6V8CMOCY6NZ1NQDPGFgbTt4A= -google.golang.org/grpc v1.69.4/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4= +google.golang.org/grpc v1.70.0 h1:pWFv03aZoHzlRKHWicjsZytKAiYCtNS0dHbXnIdq7jQ= +google.golang.org/grpc v1.70.0/go.mod h1:ofIJqVKDXx/JiXrwr2IG4/zwdH9txy3IlF40RmcJSQw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -443,8 +443,8 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.36.3 h1:82DV7MYdb8anAVi3qge1wSnMDrnKK7ebr+I0hHRN1BU= -google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/protobuf v1.36.4 h1:6A3ZDJHn/eNqc1i+IdefRzy/9PokBTPvcqMySR7NNIM= +google.golang.org/protobuf v1.36.4/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/collector/processors/odigossourcesfilterprocessor/generated_component_test.go b/collector/processors/odigossourcesfilterprocessor/generated_component_test.go index 0c580ac971..b9609b0f2e 100644 --- a/collector/processors/odigossourcesfilterprocessor/generated_component_test.go +++ b/collector/processors/odigossourcesfilterprocessor/generated_component_test.go @@ -32,8 +32,8 @@ func TestComponentLifecycle(t *testing.T) { factory := NewFactory() tests := []struct { - name string createFn func(ctx context.Context, set processor.Settings, cfg component.Config) (component.Component, error) + name string }{ { diff --git a/collector/processors/odigossourcesfilterprocessor/go.mod b/collector/processors/odigossourcesfilterprocessor/go.mod index 5f706c12e8..8e56a0c1fe 100644 --- a/collector/processors/odigossourcesfilterprocessor/go.mod +++ b/collector/processors/odigossourcesfilterprocessor/go.mod @@ -3,10 +3,10 @@ module github.com/odigos-io/odigos/processor/odigossourcesfilterprocessor go 1.23.0 require ( - go.opentelemetry.io/collector/component v0.118.0 - go.opentelemetry.io/collector/consumer v1.24.0 - go.opentelemetry.io/collector/pdata v1.24.0 - go.opentelemetry.io/collector/processor v0.118.0 + go.opentelemetry.io/collector/component v0.119.0 + go.opentelemetry.io/collector/consumer v1.25.0 + go.opentelemetry.io/collector/pdata v1.25.0 + go.opentelemetry.io/collector/processor v0.119.0 go.opentelemetry.io/otel v1.34.0 // indirect go.opentelemetry.io/otel/metric v1.34.0 // indirect go.opentelemetry.io/otel/trace v1.34.0 // indirect @@ -15,10 +15,10 @@ require ( require ( github.com/stretchr/testify v1.10.0 - go.opentelemetry.io/collector/component/componenttest v0.118.0 - go.opentelemetry.io/collector/confmap v1.24.0 - go.opentelemetry.io/collector/consumer/consumertest v0.118.0 - go.opentelemetry.io/collector/processor/processortest v0.118.0 + go.opentelemetry.io/collector/component/componenttest v0.119.0 + go.opentelemetry.io/collector/confmap v1.25.0 + go.opentelemetry.io/collector/consumer/consumertest v0.119.0 + go.opentelemetry.io/collector/processor/processortest v0.119.0 go.uber.org/goleak v1.3.0 ) @@ -39,13 +39,13 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect go.opentelemetry.io/auto/sdk v1.1.0 // indirect - go.opentelemetry.io/collector/component/componentstatus v0.118.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.118.0 // indirect - go.opentelemetry.io/collector/consumer/xconsumer v0.118.0 // indirect - go.opentelemetry.io/collector/pdata/pprofile v0.118.0 // indirect - go.opentelemetry.io/collector/pdata/testdata v0.118.0 // indirect - go.opentelemetry.io/collector/pipeline v0.118.0 // indirect - go.opentelemetry.io/collector/processor/xprocessor v0.118.0 // indirect + go.opentelemetry.io/collector/component/componentstatus v0.119.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.119.0 // indirect + go.opentelemetry.io/collector/consumer/xconsumer v0.119.0 // indirect + go.opentelemetry.io/collector/pdata/pprofile v0.119.0 // indirect + go.opentelemetry.io/collector/pdata/testdata v0.119.0 // indirect + go.opentelemetry.io/collector/pipeline v0.119.0 // indirect + go.opentelemetry.io/collector/processor/xprocessor v0.119.0 // indirect go.opentelemetry.io/otel/sdk v1.34.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.34.0 // indirect go.uber.org/multierr v1.11.0 // indirect @@ -53,7 +53,7 @@ require ( golang.org/x/sys v0.29.0 // indirect golang.org/x/text v0.21.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect - google.golang.org/grpc v1.69.4 // indirect - google.golang.org/protobuf v1.36.3 // indirect + google.golang.org/grpc v1.70.0 // indirect + google.golang.org/protobuf v1.36.4 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/collector/processors/odigossourcesfilterprocessor/go.sum b/collector/processors/odigossourcesfilterprocessor/go.sum index a6fce5b710..f17ed51a80 100644 --- a/collector/processors/odigossourcesfilterprocessor/go.sum +++ b/collector/processors/odigossourcesfilterprocessor/go.sum @@ -54,36 +54,36 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/collector/component v0.118.0 h1:sSO/ObxJ+yH77Z4DmT1mlSuxhbgUmY1ztt7xCA1F/8w= -go.opentelemetry.io/collector/component v0.118.0/go.mod h1:LUJ3AL2b+tmFr3hZol3hzKzCMvNdqNq0M5CF3SWdv4M= -go.opentelemetry.io/collector/component/componentstatus v0.118.0 h1:1aCIdUjqz0noKNQr1v04P+lwF89Lkua5U7BhH9IAxkE= -go.opentelemetry.io/collector/component/componentstatus v0.118.0/go.mod h1:ynO1Nyj0t1h6x/djIMJy35bhnnWEc2mlQaFgDNUO504= -go.opentelemetry.io/collector/component/componenttest v0.118.0 h1:knEHckoiL2fEWSIc0iehg39zP4IXzi9sHa45O+oxKo8= -go.opentelemetry.io/collector/component/componenttest v0.118.0/go.mod h1:aHc7t7zVwCpbhrWIWY+GMuaMxMCUP8C8P7pJOt8r/vU= -go.opentelemetry.io/collector/config/configtelemetry v0.118.0 h1:UlN46EViG2X42odWtXgWaqY7Y01ZKpsnswSwXTWx5mM= -go.opentelemetry.io/collector/config/configtelemetry v0.118.0/go.mod h1:SlBEwQg0qly75rXZ6W1Ig8jN25KBVBkFIIAUI1GiAAE= -go.opentelemetry.io/collector/confmap v1.24.0 h1:UUHVhkDCsVw14jPOarug9PDQE2vaB2ELPWMr7ARFBCA= -go.opentelemetry.io/collector/confmap v1.24.0/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= -go.opentelemetry.io/collector/consumer v1.24.0 h1:7DeyBm9qdr1EPuCfPjWyChPK16DbVc0wZeSa9LZprFU= -go.opentelemetry.io/collector/consumer v1.24.0/go.mod h1:0G6jvZprIp4dpKMD1ZxCjriiP9GdFvFMObsQEtTk71s= -go.opentelemetry.io/collector/consumer/consumertest v0.118.0 h1:8AAS9ejQapP1zqt0+cI6u+AUBheT3X0171N9WtXWsVY= -go.opentelemetry.io/collector/consumer/consumertest v0.118.0/go.mod h1:spRM2wyGr4QZzqMHlLmZnqRCxqXN4Wd0piogC4Qb5PQ= -go.opentelemetry.io/collector/consumer/xconsumer v0.118.0 h1:guWnzzRqgCInjnYlOQ1BPrimppNGIVvnknAjlIbWXuY= -go.opentelemetry.io/collector/consumer/xconsumer v0.118.0/go.mod h1:C5V2d6Ys/Fi6k3tzjBmbdZ9v3J/rZSAMlhx4KVcMIIg= -go.opentelemetry.io/collector/pdata v1.24.0 h1:D6j92eAzmAbQgivNBUnt8r9juOl8ugb+ihYynoFZIEg= -go.opentelemetry.io/collector/pdata v1.24.0/go.mod h1:cf3/W9E/uIvPS4MR26SnMFJhraUCattzzM6qusuONuc= -go.opentelemetry.io/collector/pdata/pprofile v0.118.0 h1:VK/fr65VFOwEhsSGRPj5c3lCv0yIK1Kt0sZxv9WZBb8= -go.opentelemetry.io/collector/pdata/pprofile v0.118.0/go.mod h1:eJyP/vBm179EghV3dPSnamGAWQwLyd+4z/3yG54YFoQ= -go.opentelemetry.io/collector/pdata/testdata v0.118.0 h1:5N0w1SX9KIRkwvtkrpzQgXy9eGk3vfNG0ds6mhEPMIM= -go.opentelemetry.io/collector/pdata/testdata v0.118.0/go.mod h1:UY+GHV5bOC1BnFburOZ0wiHReJj1XbW12mi2Ogbc5Lw= -go.opentelemetry.io/collector/pipeline v0.118.0 h1:RI1DMe7L0+5hGkx0EDGxG00TaJoh96MEQppgOlGx1Oc= -go.opentelemetry.io/collector/pipeline v0.118.0/go.mod h1:qE3DmoB05AW0C3lmPvdxZqd/H4po84NPzd5MrqgtL74= -go.opentelemetry.io/collector/processor v0.118.0 h1:NlqWiTTpPP+EPbrqTcNP9nh/4O4/9U9RGWVB49xo4ws= -go.opentelemetry.io/collector/processor v0.118.0/go.mod h1:Y8OD7wk51oPuBqrbn1qXIK91AbprRHP76hlvEzC24U4= -go.opentelemetry.io/collector/processor/processortest v0.118.0 h1:VfTLHuIaJWGyUmrvAOvf63gPMf1vAW68/jtJClEsKtU= -go.opentelemetry.io/collector/processor/processortest v0.118.0/go.mod h1:ZFWxsSoafGNOEk83FtGz43M5ypUzAOvGnfT0aQTDHdU= -go.opentelemetry.io/collector/processor/xprocessor v0.118.0 h1:M/EMhPRbadHLpv7g99fBjfgyuYexBZmgQqb2vjTXjvM= -go.opentelemetry.io/collector/processor/xprocessor v0.118.0/go.mod h1:lkoQoCv2Cz+C0kf2VHgBUDYWDecZLLeaHEvHDXbBCXU= +go.opentelemetry.io/collector/component v0.119.0 h1:ZVp9myF1Bc4BLa1V4C15Jy/VpqKPPhvbxpe9pP1mPMc= +go.opentelemetry.io/collector/component v0.119.0/go.mod h1:wtuWxFl+Ky9E/5+t2FwHoLyADDiBFFDdx8fN3fEs0n8= +go.opentelemetry.io/collector/component/componentstatus v0.119.0 h1:H8isEInGaWhnDfuG1Ax663dlsPgF4aM20sgraM6HmSI= +go.opentelemetry.io/collector/component/componentstatus v0.119.0/go.mod h1:Hr7scHUFPhyT32IkzKq06cdhRH9jMKvnKbDVYRUEnqE= +go.opentelemetry.io/collector/component/componenttest v0.119.0 h1:nVlBmKSu56zO/qCcNgDYCQsRoWAL+NPkrkIPAbapdQM= +go.opentelemetry.io/collector/component/componenttest v0.119.0/go.mod h1:H6KVzLkNhB/deEijLcq91Kjgs9Oshx2ZsFAwaMcuTLs= +go.opentelemetry.io/collector/config/configtelemetry v0.119.0 h1:gAgMUEVXZKgpASxOrhS55DyA/aYatq0U6gitZI8MLXw= +go.opentelemetry.io/collector/config/configtelemetry v0.119.0/go.mod h1:SlBEwQg0qly75rXZ6W1Ig8jN25KBVBkFIIAUI1GiAAE= +go.opentelemetry.io/collector/confmap v1.25.0 h1:dLqd6hF4JqcDHl5GWWhc2jXsHs3hkq3KPvU/2Nw5aN4= +go.opentelemetry.io/collector/confmap v1.25.0/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/consumer v1.25.0 h1:qCJa7Hh7lY3vYWgwcEgTGSjjITLCn+BSsya8LxjpoPY= +go.opentelemetry.io/collector/consumer v1.25.0/go.mod h1:ToBfr3BexnhHuxC8/XszkKP/YtkgsGd0yjFMQXNwvT8= +go.opentelemetry.io/collector/consumer/consumertest v0.119.0 h1:hZxdlvfOBzy/rl6mIyrannM4M+7zyv7C947f6W9Leio= +go.opentelemetry.io/collector/consumer/consumertest v0.119.0/go.mod h1:pfXxA2CCwbieymnX0ShZuHjwrWzmxJapsb8ZiSqojVc= +go.opentelemetry.io/collector/consumer/xconsumer v0.119.0 h1:s9DrRdb1kYXy2psr34zGG5sI+F4GRBIhjvEsh7C7FtE= +go.opentelemetry.io/collector/consumer/xconsumer v0.119.0/go.mod h1:3fvk+0hd4WMv76+oUUNah0rQ35dZzH3zyMMCg9MtsuY= +go.opentelemetry.io/collector/pdata v1.25.0 h1:AmgBklQfbfy0lT8qsoJtRuYMZ7ZV3VZvkvhjSDentrg= +go.opentelemetry.io/collector/pdata v1.25.0/go.mod h1:Zs7D4RXOGS7E2faGc/jfWdbmhoiHBxA7QbpuJOioxq8= +go.opentelemetry.io/collector/pdata/pprofile v0.119.0 h1:sVtv/MhQ3NDLkgHOWDF9BdTtThNyXdOUiz5+poRkYLQ= +go.opentelemetry.io/collector/pdata/pprofile v0.119.0/go.mod h1:ur4388PjUpmwG5HoSMzrLCPkR0gNVLT4lekcJMRPt8A= +go.opentelemetry.io/collector/pdata/testdata v0.119.0 h1:a3OiuLYx7CaEQQ8LxMhPIM804eIGlNM6Pd0XoACXWMI= +go.opentelemetry.io/collector/pdata/testdata v0.119.0/go.mod h1:stCgL1fKOVp93mI4ocHy/xBMhkW3TXr8VetH4X86q8g= +go.opentelemetry.io/collector/pipeline v0.119.0 h1:NebdPIOBIzU7CdOE36hNrCrUML+XOTR9Zsoy43E7MVk= +go.opentelemetry.io/collector/pipeline v0.119.0/go.mod h1:qE3DmoB05AW0C3lmPvdxZqd/H4po84NPzd5MrqgtL74= +go.opentelemetry.io/collector/processor v0.119.0 h1:mqmdR/f4I/ud2jwODqwPZvJk/TCU+AjoCAyattyKXmE= +go.opentelemetry.io/collector/processor v0.119.0/go.mod h1:N0XxvcnM1EYmZ/NiGNsFpi3bEzZ9+C6bVZKDa7tUduw= +go.opentelemetry.io/collector/processor/processortest v0.119.0 h1:0/mWuyDvELipmEIMVscOAy1vAcwUttym8yb+KLOJXmc= +go.opentelemetry.io/collector/processor/processortest v0.119.0/go.mod h1:JGqoUDWC3aFbyPbpZbdvTTDssvR7Rgfpf72VY5FeDHw= +go.opentelemetry.io/collector/processor/xprocessor v0.119.0 h1:qWWcMgde/2cLBg9MUQk0AcxC/aD34wz2GY3qrWeEHiw= +go.opentelemetry.io/collector/processor/xprocessor v0.119.0/go.mod h1:ZYtJGcZSDEB54vzulS8jdlYBpPbjklEODaVRc27TlxE= go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY= go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI= go.opentelemetry.io/otel/metric v1.34.0 h1:+eTR3U0MyfWjRDhmFMxe2SsW64QrZ84AOhvqS7Y+PoQ= @@ -133,10 +133,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-20250115164207-1a7da9e5054f h1:OxYkA3wjPsZyBylwymxSHa7ViiW1Sml4ToBrncvFehI= google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f/go.mod h1:+2Yz8+CLJbIfL9z73EW45avw8Lmge3xVElCP9zEKi50= -google.golang.org/grpc v1.69.4 h1:MF5TftSMkd8GLw/m0KM6V8CMOCY6NZ1NQDPGFgbTt4A= -google.golang.org/grpc v1.69.4/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4= -google.golang.org/protobuf v1.36.3 h1:82DV7MYdb8anAVi3qge1wSnMDrnKK7ebr+I0hHRN1BU= -google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/grpc v1.70.0 h1:pWFv03aZoHzlRKHWicjsZytKAiYCtNS0dHbXnIdq7jQ= +google.golang.org/grpc v1.70.0/go.mod h1:ofIJqVKDXx/JiXrwr2IG4/zwdH9txy3IlF40RmcJSQw= +google.golang.org/protobuf v1.36.4 h1:6A3ZDJHn/eNqc1i+IdefRzy/9PokBTPvcqMySR7NNIM= +google.golang.org/protobuf v1.36.4/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/collector/processors/odigossqldboperationprocessor/generated_component_test.go b/collector/processors/odigossqldboperationprocessor/generated_component_test.go index 5b4e163874..295cbc17e8 100644 --- a/collector/processors/odigossqldboperationprocessor/generated_component_test.go +++ b/collector/processors/odigossqldboperationprocessor/generated_component_test.go @@ -32,8 +32,8 @@ func TestComponentLifecycle(t *testing.T) { factory := NewFactory() tests := []struct { - name string createFn func(ctx context.Context, set processor.Settings, cfg component.Config) (component.Component, error) + name string }{ { diff --git a/collector/processors/odigossqldboperationprocessor/go.mod b/collector/processors/odigossqldboperationprocessor/go.mod index 9211e75588..12ca440031 100644 --- a/collector/processors/odigossqldboperationprocessor/go.mod +++ b/collector/processors/odigossqldboperationprocessor/go.mod @@ -4,26 +4,26 @@ go 1.23.0 require ( github.com/stretchr/testify v1.10.0 - go.opentelemetry.io/collector/component v0.118.0 - go.opentelemetry.io/collector/component/componenttest v0.118.0 - go.opentelemetry.io/collector/confmap v1.24.0 - go.opentelemetry.io/collector/consumer v1.24.0 - go.opentelemetry.io/collector/consumer/consumertest v0.118.0 - go.opentelemetry.io/collector/pdata v1.24.0 - go.opentelemetry.io/collector/processor v0.118.0 - go.opentelemetry.io/collector/processor/processortest v0.118.0 + go.opentelemetry.io/collector/component v0.119.0 + go.opentelemetry.io/collector/component/componenttest v0.119.0 + go.opentelemetry.io/collector/confmap v1.25.0 + go.opentelemetry.io/collector/consumer v1.25.0 + go.opentelemetry.io/collector/consumer/consumertest v0.119.0 + go.opentelemetry.io/collector/pdata v1.25.0 + go.opentelemetry.io/collector/processor v0.119.0 + go.opentelemetry.io/collector/processor/processortest v0.119.0 go.opentelemetry.io/otel v1.34.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) require ( - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.118.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.119.0 // indirect go.opentelemetry.io/auto/sdk v1.1.0 // indirect - go.opentelemetry.io/collector/component/componentstatus v0.118.0 // indirect - go.opentelemetry.io/collector/consumer/xconsumer v0.118.0 // indirect - go.opentelemetry.io/collector/pipeline v0.118.0 // indirect - go.opentelemetry.io/collector/processor/xprocessor v0.118.0 // indirect + go.opentelemetry.io/collector/component/componentstatus v0.119.0 // indirect + go.opentelemetry.io/collector/consumer/xconsumer v0.119.0 // indirect + go.opentelemetry.io/collector/pipeline v0.119.0 // indirect + go.opentelemetry.io/collector/processor/xprocessor v0.119.0 // indirect ) require ( @@ -42,11 +42,11 @@ 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/pdatatest v0.118.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.119.0 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.118.0 // indirect - go.opentelemetry.io/collector/pdata/pprofile v0.118.0 // indirect - go.opentelemetry.io/collector/pdata/testdata v0.118.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.119.0 // indirect + go.opentelemetry.io/collector/pdata/pprofile v0.119.0 // indirect + go.opentelemetry.io/collector/pdata/testdata v0.119.0 // indirect go.opentelemetry.io/otel/metric v1.34.0 // indirect go.opentelemetry.io/otel/sdk v1.34.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.34.0 // indirect @@ -56,7 +56,7 @@ require ( golang.org/x/sys v0.29.0 // indirect golang.org/x/text v0.21.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect - google.golang.org/grpc v1.69.4 // indirect - google.golang.org/protobuf v1.36.3 // indirect + google.golang.org/grpc v1.70.0 // indirect + google.golang.org/protobuf v1.36.4 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/collector/processors/odigossqldboperationprocessor/go.sum b/collector/processors/odigossqldboperationprocessor/go.sum index d26347b28f..0ef53d43f9 100644 --- a/collector/processors/odigossqldboperationprocessor/go.sum +++ b/collector/processors/odigossqldboperationprocessor/go.sum @@ -43,12 +43,12 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.118.0 h1:Pho1MwH+cvosN6pOinGhunBwAJyyAwFnbIW5x7N/37A= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.118.0/go.mod h1:IMy3f4XjwIu+PZF9Qq5T6WZ/+mOL9l+SFjPYEQuWZh8= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.118.0 h1:DSoYrOjLv23HXpx72hl61br4ZZTj6dqtwZSGoypKWIA= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.118.0/go.mod h1:nR+r7aAbsktscJk4fGmzljblbZBMaiZcIWeKbXV+HmY= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.118.0 h1:aUTSkzJExtrlHN32g8hX/cRNEo2ZmucPg+vwPqOYvhg= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.118.0/go.mod h1:a3sewj4nEozMwcNwZTHPzddS+1BnA6BaAkO/CRIGHVU= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.119.0 h1:Nc1rvF/hxp8TwYOSsA2qmvIQlS+8lougZsyxcTN6U78= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.119.0/go.mod h1:7ePS4L6s7UcWxxgIQkAiI5db/OxwRAV9+kziKVIO3Y8= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.119.0 h1:2ztsxw6DH2CbXbykCGgPSZmHHRilNuD06VOfI/z9xGs= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.119.0/go.mod h1:q5LK/pXBToCu4W+tSVWM2ST5jOWqvDMVVCB7TQqhsbY= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.119.0 h1:qSnBSa1zO4szSQOrVyinm/9Bg68oYv6NarcaV4Rusr8= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.119.0/go.mod h1:udnlBYxPMO+odronKnPfYY8M+BnxfaQFXuJgfI5miUw= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= @@ -62,36 +62,36 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/collector/component v0.118.0 h1:sSO/ObxJ+yH77Z4DmT1mlSuxhbgUmY1ztt7xCA1F/8w= -go.opentelemetry.io/collector/component v0.118.0/go.mod h1:LUJ3AL2b+tmFr3hZol3hzKzCMvNdqNq0M5CF3SWdv4M= -go.opentelemetry.io/collector/component/componentstatus v0.118.0 h1:1aCIdUjqz0noKNQr1v04P+lwF89Lkua5U7BhH9IAxkE= -go.opentelemetry.io/collector/component/componentstatus v0.118.0/go.mod h1:ynO1Nyj0t1h6x/djIMJy35bhnnWEc2mlQaFgDNUO504= -go.opentelemetry.io/collector/component/componenttest v0.118.0 h1:knEHckoiL2fEWSIc0iehg39zP4IXzi9sHa45O+oxKo8= -go.opentelemetry.io/collector/component/componenttest v0.118.0/go.mod h1:aHc7t7zVwCpbhrWIWY+GMuaMxMCUP8C8P7pJOt8r/vU= -go.opentelemetry.io/collector/config/configtelemetry v0.118.0 h1:UlN46EViG2X42odWtXgWaqY7Y01ZKpsnswSwXTWx5mM= -go.opentelemetry.io/collector/config/configtelemetry v0.118.0/go.mod h1:SlBEwQg0qly75rXZ6W1Ig8jN25KBVBkFIIAUI1GiAAE= -go.opentelemetry.io/collector/confmap v1.24.0 h1:UUHVhkDCsVw14jPOarug9PDQE2vaB2ELPWMr7ARFBCA= -go.opentelemetry.io/collector/confmap v1.24.0/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= -go.opentelemetry.io/collector/consumer v1.24.0 h1:7DeyBm9qdr1EPuCfPjWyChPK16DbVc0wZeSa9LZprFU= -go.opentelemetry.io/collector/consumer v1.24.0/go.mod h1:0G6jvZprIp4dpKMD1ZxCjriiP9GdFvFMObsQEtTk71s= -go.opentelemetry.io/collector/consumer/consumertest v0.118.0 h1:8AAS9ejQapP1zqt0+cI6u+AUBheT3X0171N9WtXWsVY= -go.opentelemetry.io/collector/consumer/consumertest v0.118.0/go.mod h1:spRM2wyGr4QZzqMHlLmZnqRCxqXN4Wd0piogC4Qb5PQ= -go.opentelemetry.io/collector/consumer/xconsumer v0.118.0 h1:guWnzzRqgCInjnYlOQ1BPrimppNGIVvnknAjlIbWXuY= -go.opentelemetry.io/collector/consumer/xconsumer v0.118.0/go.mod h1:C5V2d6Ys/Fi6k3tzjBmbdZ9v3J/rZSAMlhx4KVcMIIg= -go.opentelemetry.io/collector/pdata v1.24.0 h1:D6j92eAzmAbQgivNBUnt8r9juOl8ugb+ihYynoFZIEg= -go.opentelemetry.io/collector/pdata v1.24.0/go.mod h1:cf3/W9E/uIvPS4MR26SnMFJhraUCattzzM6qusuONuc= -go.opentelemetry.io/collector/pdata/pprofile v0.118.0 h1:VK/fr65VFOwEhsSGRPj5c3lCv0yIK1Kt0sZxv9WZBb8= -go.opentelemetry.io/collector/pdata/pprofile v0.118.0/go.mod h1:eJyP/vBm179EghV3dPSnamGAWQwLyd+4z/3yG54YFoQ= -go.opentelemetry.io/collector/pdata/testdata v0.118.0 h1:5N0w1SX9KIRkwvtkrpzQgXy9eGk3vfNG0ds6mhEPMIM= -go.opentelemetry.io/collector/pdata/testdata v0.118.0/go.mod h1:UY+GHV5bOC1BnFburOZ0wiHReJj1XbW12mi2Ogbc5Lw= -go.opentelemetry.io/collector/pipeline v0.118.0 h1:RI1DMe7L0+5hGkx0EDGxG00TaJoh96MEQppgOlGx1Oc= -go.opentelemetry.io/collector/pipeline v0.118.0/go.mod h1:qE3DmoB05AW0C3lmPvdxZqd/H4po84NPzd5MrqgtL74= -go.opentelemetry.io/collector/processor v0.118.0 h1:NlqWiTTpPP+EPbrqTcNP9nh/4O4/9U9RGWVB49xo4ws= -go.opentelemetry.io/collector/processor v0.118.0/go.mod h1:Y8OD7wk51oPuBqrbn1qXIK91AbprRHP76hlvEzC24U4= -go.opentelemetry.io/collector/processor/processortest v0.118.0 h1:VfTLHuIaJWGyUmrvAOvf63gPMf1vAW68/jtJClEsKtU= -go.opentelemetry.io/collector/processor/processortest v0.118.0/go.mod h1:ZFWxsSoafGNOEk83FtGz43M5ypUzAOvGnfT0aQTDHdU= -go.opentelemetry.io/collector/processor/xprocessor v0.118.0 h1:M/EMhPRbadHLpv7g99fBjfgyuYexBZmgQqb2vjTXjvM= -go.opentelemetry.io/collector/processor/xprocessor v0.118.0/go.mod h1:lkoQoCv2Cz+C0kf2VHgBUDYWDecZLLeaHEvHDXbBCXU= +go.opentelemetry.io/collector/component v0.119.0 h1:ZVp9myF1Bc4BLa1V4C15Jy/VpqKPPhvbxpe9pP1mPMc= +go.opentelemetry.io/collector/component v0.119.0/go.mod h1:wtuWxFl+Ky9E/5+t2FwHoLyADDiBFFDdx8fN3fEs0n8= +go.opentelemetry.io/collector/component/componentstatus v0.119.0 h1:H8isEInGaWhnDfuG1Ax663dlsPgF4aM20sgraM6HmSI= +go.opentelemetry.io/collector/component/componentstatus v0.119.0/go.mod h1:Hr7scHUFPhyT32IkzKq06cdhRH9jMKvnKbDVYRUEnqE= +go.opentelemetry.io/collector/component/componenttest v0.119.0 h1:nVlBmKSu56zO/qCcNgDYCQsRoWAL+NPkrkIPAbapdQM= +go.opentelemetry.io/collector/component/componenttest v0.119.0/go.mod h1:H6KVzLkNhB/deEijLcq91Kjgs9Oshx2ZsFAwaMcuTLs= +go.opentelemetry.io/collector/config/configtelemetry v0.119.0 h1:gAgMUEVXZKgpASxOrhS55DyA/aYatq0U6gitZI8MLXw= +go.opentelemetry.io/collector/config/configtelemetry v0.119.0/go.mod h1:SlBEwQg0qly75rXZ6W1Ig8jN25KBVBkFIIAUI1GiAAE= +go.opentelemetry.io/collector/confmap v1.25.0 h1:dLqd6hF4JqcDHl5GWWhc2jXsHs3hkq3KPvU/2Nw5aN4= +go.opentelemetry.io/collector/confmap v1.25.0/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/consumer v1.25.0 h1:qCJa7Hh7lY3vYWgwcEgTGSjjITLCn+BSsya8LxjpoPY= +go.opentelemetry.io/collector/consumer v1.25.0/go.mod h1:ToBfr3BexnhHuxC8/XszkKP/YtkgsGd0yjFMQXNwvT8= +go.opentelemetry.io/collector/consumer/consumertest v0.119.0 h1:hZxdlvfOBzy/rl6mIyrannM4M+7zyv7C947f6W9Leio= +go.opentelemetry.io/collector/consumer/consumertest v0.119.0/go.mod h1:pfXxA2CCwbieymnX0ShZuHjwrWzmxJapsb8ZiSqojVc= +go.opentelemetry.io/collector/consumer/xconsumer v0.119.0 h1:s9DrRdb1kYXy2psr34zGG5sI+F4GRBIhjvEsh7C7FtE= +go.opentelemetry.io/collector/consumer/xconsumer v0.119.0/go.mod h1:3fvk+0hd4WMv76+oUUNah0rQ35dZzH3zyMMCg9MtsuY= +go.opentelemetry.io/collector/pdata v1.25.0 h1:AmgBklQfbfy0lT8qsoJtRuYMZ7ZV3VZvkvhjSDentrg= +go.opentelemetry.io/collector/pdata v1.25.0/go.mod h1:Zs7D4RXOGS7E2faGc/jfWdbmhoiHBxA7QbpuJOioxq8= +go.opentelemetry.io/collector/pdata/pprofile v0.119.0 h1:sVtv/MhQ3NDLkgHOWDF9BdTtThNyXdOUiz5+poRkYLQ= +go.opentelemetry.io/collector/pdata/pprofile v0.119.0/go.mod h1:ur4388PjUpmwG5HoSMzrLCPkR0gNVLT4lekcJMRPt8A= +go.opentelemetry.io/collector/pdata/testdata v0.119.0 h1:a3OiuLYx7CaEQQ8LxMhPIM804eIGlNM6Pd0XoACXWMI= +go.opentelemetry.io/collector/pdata/testdata v0.119.0/go.mod h1:stCgL1fKOVp93mI4ocHy/xBMhkW3TXr8VetH4X86q8g= +go.opentelemetry.io/collector/pipeline v0.119.0 h1:NebdPIOBIzU7CdOE36hNrCrUML+XOTR9Zsoy43E7MVk= +go.opentelemetry.io/collector/pipeline v0.119.0/go.mod h1:qE3DmoB05AW0C3lmPvdxZqd/H4po84NPzd5MrqgtL74= +go.opentelemetry.io/collector/processor v0.119.0 h1:mqmdR/f4I/ud2jwODqwPZvJk/TCU+AjoCAyattyKXmE= +go.opentelemetry.io/collector/processor v0.119.0/go.mod h1:N0XxvcnM1EYmZ/NiGNsFpi3bEzZ9+C6bVZKDa7tUduw= +go.opentelemetry.io/collector/processor/processortest v0.119.0 h1:0/mWuyDvELipmEIMVscOAy1vAcwUttym8yb+KLOJXmc= +go.opentelemetry.io/collector/processor/processortest v0.119.0/go.mod h1:JGqoUDWC3aFbyPbpZbdvTTDssvR7Rgfpf72VY5FeDHw= +go.opentelemetry.io/collector/processor/xprocessor v0.119.0 h1:qWWcMgde/2cLBg9MUQk0AcxC/aD34wz2GY3qrWeEHiw= +go.opentelemetry.io/collector/processor/xprocessor v0.119.0/go.mod h1:ZYtJGcZSDEB54vzulS8jdlYBpPbjklEODaVRc27TlxE= go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY= go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI= go.opentelemetry.io/otel/metric v1.34.0 h1:+eTR3U0MyfWjRDhmFMxe2SsW64QrZ84AOhvqS7Y+PoQ= @@ -141,10 +141,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-20250115164207-1a7da9e5054f h1:OxYkA3wjPsZyBylwymxSHa7ViiW1Sml4ToBrncvFehI= google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f/go.mod h1:+2Yz8+CLJbIfL9z73EW45avw8Lmge3xVElCP9zEKi50= -google.golang.org/grpc v1.69.4 h1:MF5TftSMkd8GLw/m0KM6V8CMOCY6NZ1NQDPGFgbTt4A= -google.golang.org/grpc v1.69.4/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4= -google.golang.org/protobuf v1.36.3 h1:82DV7MYdb8anAVi3qge1wSnMDrnKK7ebr+I0hHRN1BU= -google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/grpc v1.70.0 h1:pWFv03aZoHzlRKHWicjsZytKAiYCtNS0dHbXnIdq7jQ= +google.golang.org/grpc v1.70.0/go.mod h1:ofIJqVKDXx/JiXrwr2IG4/zwdH9txy3IlF40RmcJSQw= +google.golang.org/protobuf v1.36.4 h1:6A3ZDJHn/eNqc1i+IdefRzy/9PokBTPvcqMySR7NNIM= +google.golang.org/protobuf v1.36.4/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/collector/processors/odigostrafficmetrics/generated_component_test.go b/collector/processors/odigostrafficmetrics/generated_component_test.go index 0a8cdb93ff..b18ed09d8b 100644 --- a/collector/processors/odigostrafficmetrics/generated_component_test.go +++ b/collector/processors/odigostrafficmetrics/generated_component_test.go @@ -32,8 +32,8 @@ func TestComponentLifecycle(t *testing.T) { factory := NewFactory() tests := []struct { - name string createFn func(ctx context.Context, set processor.Settings, cfg component.Config) (component.Component, error) + name string }{ { diff --git a/collector/processors/odigostrafficmetrics/go.mod b/collector/processors/odigostrafficmetrics/go.mod index 62bec36c2c..a2c914e869 100644 --- a/collector/processors/odigostrafficmetrics/go.mod +++ b/collector/processors/odigostrafficmetrics/go.mod @@ -3,24 +3,22 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/odigos/processo go 1.23.0 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.118.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.119.0 github.com/stretchr/testify v1.10.0 - go.opentelemetry.io/collector/component v0.118.0 - go.opentelemetry.io/collector/component/componenttest v0.118.0 - go.opentelemetry.io/collector/config/configtelemetry v0.118.0 - go.opentelemetry.io/collector/confmap v1.24.0 - go.opentelemetry.io/collector/consumer v1.24.0 - go.opentelemetry.io/collector/consumer/consumertest v0.118.0 - go.opentelemetry.io/collector/pdata v1.24.0 - go.opentelemetry.io/collector/processor v0.118.0 - go.opentelemetry.io/collector/processor/processortest v0.118.0 + go.opentelemetry.io/collector/component v0.119.0 + go.opentelemetry.io/collector/component/componenttest v0.119.0 + go.opentelemetry.io/collector/config/configtelemetry v0.119.0 + go.opentelemetry.io/collector/confmap v1.25.0 + go.opentelemetry.io/collector/consumer v1.25.0 + go.opentelemetry.io/collector/consumer/consumertest v0.119.0 + go.opentelemetry.io/collector/pdata v1.25.0 + go.opentelemetry.io/collector/processor v0.119.0 + go.opentelemetry.io/collector/processor/processortest v0.119.0 go.opentelemetry.io/otel v1.34.0 go.opentelemetry.io/otel/metric v1.34.0 - go.opentelemetry.io/otel/sdk v1.34.0 go.opentelemetry.io/otel/sdk/metric v1.34.0 go.opentelemetry.io/otel/trace v1.34.0 go.uber.org/goleak v1.3.0 - go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 ) @@ -40,20 +38,22 @@ 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/pdatautil v0.118.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.119.0 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect go.opentelemetry.io/auto/sdk v1.1.0 // indirect - go.opentelemetry.io/collector/component/componentstatus v0.118.0 // indirect - go.opentelemetry.io/collector/consumer/xconsumer v0.118.0 // indirect - go.opentelemetry.io/collector/pdata/pprofile v0.118.0 // indirect - go.opentelemetry.io/collector/pdata/testdata v0.118.0 // indirect - go.opentelemetry.io/collector/pipeline v0.118.0 // indirect - go.opentelemetry.io/collector/processor/xprocessor v0.118.0 // indirect + go.opentelemetry.io/collector/component/componentstatus v0.119.0 // indirect + go.opentelemetry.io/collector/consumer/xconsumer v0.119.0 // indirect + go.opentelemetry.io/collector/pdata/pprofile v0.119.0 // indirect + go.opentelemetry.io/collector/pdata/testdata v0.119.0 // indirect + go.opentelemetry.io/collector/pipeline v0.119.0 // indirect + go.opentelemetry.io/collector/processor/xprocessor v0.119.0 // indirect + go.opentelemetry.io/otel/sdk v1.34.0 // indirect + go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.34.0 // indirect golang.org/x/sys v0.29.0 // indirect golang.org/x/text v0.21.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect - google.golang.org/grpc v1.69.4 // indirect - google.golang.org/protobuf v1.36.3 // indirect + google.golang.org/grpc v1.70.0 // indirect + google.golang.org/protobuf v1.36.4 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/collector/processors/odigostrafficmetrics/go.sum b/collector/processors/odigostrafficmetrics/go.sum index d26347b28f..0ef53d43f9 100644 --- a/collector/processors/odigostrafficmetrics/go.sum +++ b/collector/processors/odigostrafficmetrics/go.sum @@ -43,12 +43,12 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.118.0 h1:Pho1MwH+cvosN6pOinGhunBwAJyyAwFnbIW5x7N/37A= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.118.0/go.mod h1:IMy3f4XjwIu+PZF9Qq5T6WZ/+mOL9l+SFjPYEQuWZh8= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.118.0 h1:DSoYrOjLv23HXpx72hl61br4ZZTj6dqtwZSGoypKWIA= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.118.0/go.mod h1:nR+r7aAbsktscJk4fGmzljblbZBMaiZcIWeKbXV+HmY= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.118.0 h1:aUTSkzJExtrlHN32g8hX/cRNEo2ZmucPg+vwPqOYvhg= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.118.0/go.mod h1:a3sewj4nEozMwcNwZTHPzddS+1BnA6BaAkO/CRIGHVU= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.119.0 h1:Nc1rvF/hxp8TwYOSsA2qmvIQlS+8lougZsyxcTN6U78= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.119.0/go.mod h1:7ePS4L6s7UcWxxgIQkAiI5db/OxwRAV9+kziKVIO3Y8= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.119.0 h1:2ztsxw6DH2CbXbykCGgPSZmHHRilNuD06VOfI/z9xGs= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.119.0/go.mod h1:q5LK/pXBToCu4W+tSVWM2ST5jOWqvDMVVCB7TQqhsbY= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.119.0 h1:qSnBSa1zO4szSQOrVyinm/9Bg68oYv6NarcaV4Rusr8= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.119.0/go.mod h1:udnlBYxPMO+odronKnPfYY8M+BnxfaQFXuJgfI5miUw= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= @@ -62,36 +62,36 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/collector/component v0.118.0 h1:sSO/ObxJ+yH77Z4DmT1mlSuxhbgUmY1ztt7xCA1F/8w= -go.opentelemetry.io/collector/component v0.118.0/go.mod h1:LUJ3AL2b+tmFr3hZol3hzKzCMvNdqNq0M5CF3SWdv4M= -go.opentelemetry.io/collector/component/componentstatus v0.118.0 h1:1aCIdUjqz0noKNQr1v04P+lwF89Lkua5U7BhH9IAxkE= -go.opentelemetry.io/collector/component/componentstatus v0.118.0/go.mod h1:ynO1Nyj0t1h6x/djIMJy35bhnnWEc2mlQaFgDNUO504= -go.opentelemetry.io/collector/component/componenttest v0.118.0 h1:knEHckoiL2fEWSIc0iehg39zP4IXzi9sHa45O+oxKo8= -go.opentelemetry.io/collector/component/componenttest v0.118.0/go.mod h1:aHc7t7zVwCpbhrWIWY+GMuaMxMCUP8C8P7pJOt8r/vU= -go.opentelemetry.io/collector/config/configtelemetry v0.118.0 h1:UlN46EViG2X42odWtXgWaqY7Y01ZKpsnswSwXTWx5mM= -go.opentelemetry.io/collector/config/configtelemetry v0.118.0/go.mod h1:SlBEwQg0qly75rXZ6W1Ig8jN25KBVBkFIIAUI1GiAAE= -go.opentelemetry.io/collector/confmap v1.24.0 h1:UUHVhkDCsVw14jPOarug9PDQE2vaB2ELPWMr7ARFBCA= -go.opentelemetry.io/collector/confmap v1.24.0/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= -go.opentelemetry.io/collector/consumer v1.24.0 h1:7DeyBm9qdr1EPuCfPjWyChPK16DbVc0wZeSa9LZprFU= -go.opentelemetry.io/collector/consumer v1.24.0/go.mod h1:0G6jvZprIp4dpKMD1ZxCjriiP9GdFvFMObsQEtTk71s= -go.opentelemetry.io/collector/consumer/consumertest v0.118.0 h1:8AAS9ejQapP1zqt0+cI6u+AUBheT3X0171N9WtXWsVY= -go.opentelemetry.io/collector/consumer/consumertest v0.118.0/go.mod h1:spRM2wyGr4QZzqMHlLmZnqRCxqXN4Wd0piogC4Qb5PQ= -go.opentelemetry.io/collector/consumer/xconsumer v0.118.0 h1:guWnzzRqgCInjnYlOQ1BPrimppNGIVvnknAjlIbWXuY= -go.opentelemetry.io/collector/consumer/xconsumer v0.118.0/go.mod h1:C5V2d6Ys/Fi6k3tzjBmbdZ9v3J/rZSAMlhx4KVcMIIg= -go.opentelemetry.io/collector/pdata v1.24.0 h1:D6j92eAzmAbQgivNBUnt8r9juOl8ugb+ihYynoFZIEg= -go.opentelemetry.io/collector/pdata v1.24.0/go.mod h1:cf3/W9E/uIvPS4MR26SnMFJhraUCattzzM6qusuONuc= -go.opentelemetry.io/collector/pdata/pprofile v0.118.0 h1:VK/fr65VFOwEhsSGRPj5c3lCv0yIK1Kt0sZxv9WZBb8= -go.opentelemetry.io/collector/pdata/pprofile v0.118.0/go.mod h1:eJyP/vBm179EghV3dPSnamGAWQwLyd+4z/3yG54YFoQ= -go.opentelemetry.io/collector/pdata/testdata v0.118.0 h1:5N0w1SX9KIRkwvtkrpzQgXy9eGk3vfNG0ds6mhEPMIM= -go.opentelemetry.io/collector/pdata/testdata v0.118.0/go.mod h1:UY+GHV5bOC1BnFburOZ0wiHReJj1XbW12mi2Ogbc5Lw= -go.opentelemetry.io/collector/pipeline v0.118.0 h1:RI1DMe7L0+5hGkx0EDGxG00TaJoh96MEQppgOlGx1Oc= -go.opentelemetry.io/collector/pipeline v0.118.0/go.mod h1:qE3DmoB05AW0C3lmPvdxZqd/H4po84NPzd5MrqgtL74= -go.opentelemetry.io/collector/processor v0.118.0 h1:NlqWiTTpPP+EPbrqTcNP9nh/4O4/9U9RGWVB49xo4ws= -go.opentelemetry.io/collector/processor v0.118.0/go.mod h1:Y8OD7wk51oPuBqrbn1qXIK91AbprRHP76hlvEzC24U4= -go.opentelemetry.io/collector/processor/processortest v0.118.0 h1:VfTLHuIaJWGyUmrvAOvf63gPMf1vAW68/jtJClEsKtU= -go.opentelemetry.io/collector/processor/processortest v0.118.0/go.mod h1:ZFWxsSoafGNOEk83FtGz43M5ypUzAOvGnfT0aQTDHdU= -go.opentelemetry.io/collector/processor/xprocessor v0.118.0 h1:M/EMhPRbadHLpv7g99fBjfgyuYexBZmgQqb2vjTXjvM= -go.opentelemetry.io/collector/processor/xprocessor v0.118.0/go.mod h1:lkoQoCv2Cz+C0kf2VHgBUDYWDecZLLeaHEvHDXbBCXU= +go.opentelemetry.io/collector/component v0.119.0 h1:ZVp9myF1Bc4BLa1V4C15Jy/VpqKPPhvbxpe9pP1mPMc= +go.opentelemetry.io/collector/component v0.119.0/go.mod h1:wtuWxFl+Ky9E/5+t2FwHoLyADDiBFFDdx8fN3fEs0n8= +go.opentelemetry.io/collector/component/componentstatus v0.119.0 h1:H8isEInGaWhnDfuG1Ax663dlsPgF4aM20sgraM6HmSI= +go.opentelemetry.io/collector/component/componentstatus v0.119.0/go.mod h1:Hr7scHUFPhyT32IkzKq06cdhRH9jMKvnKbDVYRUEnqE= +go.opentelemetry.io/collector/component/componenttest v0.119.0 h1:nVlBmKSu56zO/qCcNgDYCQsRoWAL+NPkrkIPAbapdQM= +go.opentelemetry.io/collector/component/componenttest v0.119.0/go.mod h1:H6KVzLkNhB/deEijLcq91Kjgs9Oshx2ZsFAwaMcuTLs= +go.opentelemetry.io/collector/config/configtelemetry v0.119.0 h1:gAgMUEVXZKgpASxOrhS55DyA/aYatq0U6gitZI8MLXw= +go.opentelemetry.io/collector/config/configtelemetry v0.119.0/go.mod h1:SlBEwQg0qly75rXZ6W1Ig8jN25KBVBkFIIAUI1GiAAE= +go.opentelemetry.io/collector/confmap v1.25.0 h1:dLqd6hF4JqcDHl5GWWhc2jXsHs3hkq3KPvU/2Nw5aN4= +go.opentelemetry.io/collector/confmap v1.25.0/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/consumer v1.25.0 h1:qCJa7Hh7lY3vYWgwcEgTGSjjITLCn+BSsya8LxjpoPY= +go.opentelemetry.io/collector/consumer v1.25.0/go.mod h1:ToBfr3BexnhHuxC8/XszkKP/YtkgsGd0yjFMQXNwvT8= +go.opentelemetry.io/collector/consumer/consumertest v0.119.0 h1:hZxdlvfOBzy/rl6mIyrannM4M+7zyv7C947f6W9Leio= +go.opentelemetry.io/collector/consumer/consumertest v0.119.0/go.mod h1:pfXxA2CCwbieymnX0ShZuHjwrWzmxJapsb8ZiSqojVc= +go.opentelemetry.io/collector/consumer/xconsumer v0.119.0 h1:s9DrRdb1kYXy2psr34zGG5sI+F4GRBIhjvEsh7C7FtE= +go.opentelemetry.io/collector/consumer/xconsumer v0.119.0/go.mod h1:3fvk+0hd4WMv76+oUUNah0rQ35dZzH3zyMMCg9MtsuY= +go.opentelemetry.io/collector/pdata v1.25.0 h1:AmgBklQfbfy0lT8qsoJtRuYMZ7ZV3VZvkvhjSDentrg= +go.opentelemetry.io/collector/pdata v1.25.0/go.mod h1:Zs7D4RXOGS7E2faGc/jfWdbmhoiHBxA7QbpuJOioxq8= +go.opentelemetry.io/collector/pdata/pprofile v0.119.0 h1:sVtv/MhQ3NDLkgHOWDF9BdTtThNyXdOUiz5+poRkYLQ= +go.opentelemetry.io/collector/pdata/pprofile v0.119.0/go.mod h1:ur4388PjUpmwG5HoSMzrLCPkR0gNVLT4lekcJMRPt8A= +go.opentelemetry.io/collector/pdata/testdata v0.119.0 h1:a3OiuLYx7CaEQQ8LxMhPIM804eIGlNM6Pd0XoACXWMI= +go.opentelemetry.io/collector/pdata/testdata v0.119.0/go.mod h1:stCgL1fKOVp93mI4ocHy/xBMhkW3TXr8VetH4X86q8g= +go.opentelemetry.io/collector/pipeline v0.119.0 h1:NebdPIOBIzU7CdOE36hNrCrUML+XOTR9Zsoy43E7MVk= +go.opentelemetry.io/collector/pipeline v0.119.0/go.mod h1:qE3DmoB05AW0C3lmPvdxZqd/H4po84NPzd5MrqgtL74= +go.opentelemetry.io/collector/processor v0.119.0 h1:mqmdR/f4I/ud2jwODqwPZvJk/TCU+AjoCAyattyKXmE= +go.opentelemetry.io/collector/processor v0.119.0/go.mod h1:N0XxvcnM1EYmZ/NiGNsFpi3bEzZ9+C6bVZKDa7tUduw= +go.opentelemetry.io/collector/processor/processortest v0.119.0 h1:0/mWuyDvELipmEIMVscOAy1vAcwUttym8yb+KLOJXmc= +go.opentelemetry.io/collector/processor/processortest v0.119.0/go.mod h1:JGqoUDWC3aFbyPbpZbdvTTDssvR7Rgfpf72VY5FeDHw= +go.opentelemetry.io/collector/processor/xprocessor v0.119.0 h1:qWWcMgde/2cLBg9MUQk0AcxC/aD34wz2GY3qrWeEHiw= +go.opentelemetry.io/collector/processor/xprocessor v0.119.0/go.mod h1:ZYtJGcZSDEB54vzulS8jdlYBpPbjklEODaVRc27TlxE= go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY= go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI= go.opentelemetry.io/otel/metric v1.34.0 h1:+eTR3U0MyfWjRDhmFMxe2SsW64QrZ84AOhvqS7Y+PoQ= @@ -141,10 +141,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-20250115164207-1a7da9e5054f h1:OxYkA3wjPsZyBylwymxSHa7ViiW1Sml4ToBrncvFehI= google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f/go.mod h1:+2Yz8+CLJbIfL9z73EW45avw8Lmge3xVElCP9zEKi50= -google.golang.org/grpc v1.69.4 h1:MF5TftSMkd8GLw/m0KM6V8CMOCY6NZ1NQDPGFgbTt4A= -google.golang.org/grpc v1.69.4/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4= -google.golang.org/protobuf v1.36.3 h1:82DV7MYdb8anAVi3qge1wSnMDrnKK7ebr+I0hHRN1BU= -google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/grpc v1.70.0 h1:pWFv03aZoHzlRKHWicjsZytKAiYCtNS0dHbXnIdq7jQ= +google.golang.org/grpc v1.70.0/go.mod h1:ofIJqVKDXx/JiXrwr2IG4/zwdH9txy3IlF40RmcJSQw= +google.golang.org/protobuf v1.36.4 h1:6A3ZDJHn/eNqc1i+IdefRzy/9PokBTPvcqMySR7NNIM= +google.golang.org/protobuf v1.36.4/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/collector/processors/odigostrafficmetrics/internal/metadata/generated_telemetry.go b/collector/processors/odigostrafficmetrics/internal/metadata/generated_telemetry.go index 0bce275faa..6ac9f27276 100644 --- a/collector/processors/odigostrafficmetrics/internal/metadata/generated_telemetry.go +++ b/collector/processors/odigostrafficmetrics/internal/metadata/generated_telemetry.go @@ -4,13 +4,12 @@ package metadata import ( "errors" + "sync" "go.opentelemetry.io/otel/metric" - noopmetric "go.opentelemetry.io/otel/metric/noop" "go.opentelemetry.io/otel/trace" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config/configtelemetry" ) func Meter(settings component.TelemetrySettings) metric.Meter { @@ -25,6 +24,8 @@ func Tracer(settings component.TelemetrySettings) trace.Tracer { // as defined in metadata and user config. type TelemetryBuilder struct { meter metric.Meter + mu sync.Mutex + registrations []metric.Registration OdigosAcceptedLogRecords metric.Int64Counter OdigosAcceptedMetricPoints metric.Int64Counter OdigosAcceptedSpans metric.Int64Counter @@ -44,6 +45,15 @@ func (tbof telemetryBuilderOptionFunc) apply(mb *TelemetryBuilder) { tbof(mb) } +// Shutdown unregister all registered callbacks for async instruments. +func (builder *TelemetryBuilder) Shutdown() { + builder.mu.Lock() + defer builder.mu.Unlock() + for _, reg := range builder.registrations { + reg.Unregister() + } +} + // NewTelemetryBuilder provides a struct with methods to update all internal telemetry // for a component func NewTelemetryBuilder(settings component.TelemetrySettings, options ...TelemetryBuilderOption) (*TelemetryBuilder, error) { @@ -53,37 +63,37 @@ func NewTelemetryBuilder(settings component.TelemetrySettings, options ...Teleme } builder.meter = Meter(settings) var err, errs error - builder.OdigosAcceptedLogRecords, err = getLeveledMeter(builder.meter, configtelemetry.LevelBasic, settings.MetricsLevel).Int64Counter( + builder.OdigosAcceptedLogRecords, err = builder.meter.Int64Counter( "otelcol_odigos_accepted_log_records", metric.WithDescription("Number of log records passed through the processor."), metric.WithUnit("{records}"), ) errs = errors.Join(errs, err) - builder.OdigosAcceptedMetricPoints, err = getLeveledMeter(builder.meter, configtelemetry.LevelBasic, settings.MetricsLevel).Int64Counter( + builder.OdigosAcceptedMetricPoints, err = builder.meter.Int64Counter( "otelcol_odigos_accepted_metric_points", metric.WithDescription("Number of data points passed through the processor."), metric.WithUnit("{datapoints}"), ) errs = errors.Join(errs, err) - builder.OdigosAcceptedSpans, err = getLeveledMeter(builder.meter, configtelemetry.LevelBasic, settings.MetricsLevel).Int64Counter( + builder.OdigosAcceptedSpans, err = builder.meter.Int64Counter( "otelcol_odigos_accepted_spans", metric.WithDescription("Number of spans passed through the processor."), metric.WithUnit("{spans}"), ) errs = errors.Join(errs, err) - builder.OdigosLogDataSize, err = getLeveledMeter(builder.meter, configtelemetry.LevelBasic, settings.MetricsLevel).Int64Counter( + builder.OdigosLogDataSize, err = builder.meter.Int64Counter( "otelcol_odigos_log_data_size", metric.WithDescription("Total size of log data passed to the processor"), metric.WithUnit("By"), ) errs = errors.Join(errs, err) - builder.OdigosMetricDataSize, err = getLeveledMeter(builder.meter, configtelemetry.LevelBasic, settings.MetricsLevel).Int64Counter( + builder.OdigosMetricDataSize, err = builder.meter.Int64Counter( "otelcol_odigos_metric_data_size", metric.WithDescription("Total size of metric data passed to the processor"), metric.WithUnit("By"), ) errs = errors.Join(errs, err) - builder.OdigosTraceDataSize, err = getLeveledMeter(builder.meter, configtelemetry.LevelBasic, settings.MetricsLevel).Int64Counter( + builder.OdigosTraceDataSize, err = builder.meter.Int64Counter( "otelcol_odigos_trace_data_size", metric.WithDescription("Total size of trace data passed to the processor"), metric.WithUnit("By"), @@ -91,10 +101,3 @@ func NewTelemetryBuilder(settings component.TelemetrySettings, options ...Teleme errs = errors.Join(errs, err) return &builder, errs } - -func getLeveledMeter(meter metric.Meter, cfgLevel, srvLevel configtelemetry.Level) metric.Meter { - if cfgLevel <= srvLevel { - return meter - } - return noopmetric.Meter{} -} diff --git a/collector/processors/odigostrafficmetrics/internal/metadatatest/generated_telemetrytest.go b/collector/processors/odigostrafficmetrics/internal/metadatatest/generated_telemetrytest.go index 177244a0a6..a23a322702 100644 --- a/collector/processors/odigostrafficmetrics/internal/metadatatest/generated_telemetrytest.go +++ b/collector/processors/odigostrafficmetrics/internal/metadatatest/generated_telemetrytest.go @@ -7,60 +7,43 @@ import ( "testing" "github.com/stretchr/testify/require" - sdkmetric "go.opentelemetry.io/otel/sdk/metric" - "go.opentelemetry.io/otel/sdk/metric/metricdata" - "go.opentelemetry.io/otel/sdk/metric/metricdata/metricdatatest" - sdktrace "go.opentelemetry.io/otel/sdk/trace" - "go.opentelemetry.io/otel/sdk/trace/tracetest" - "go.uber.org/multierr" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configtelemetry" "go.opentelemetry.io/collector/processor" "go.opentelemetry.io/collector/processor/processortest" + "go.opentelemetry.io/otel/sdk/metric/metricdata" + "go.opentelemetry.io/otel/sdk/metric/metricdata/metricdatatest" ) +// Deprecated: [v0.119.0] Use componenttest.Telemetry type Telemetry struct { - Reader *sdkmetric.ManualReader - SpanRecorder *tracetest.SpanRecorder - - meterProvider *sdkmetric.MeterProvider - traceProvider *sdktrace.TracerProvider + *componenttest.Telemetry } -func SetupTelemetry() Telemetry { - reader := sdkmetric.NewManualReader() - spanRecorder := new(tracetest.SpanRecorder) - return Telemetry{ - Reader: reader, - SpanRecorder: spanRecorder, - - meterProvider: sdkmetric.NewMeterProvider(sdkmetric.WithReader(reader)), - traceProvider: sdktrace.NewTracerProvider(sdktrace.WithSpanProcessor(spanRecorder)), - } +// Deprecated: [v0.119.0] Use componenttest.NewTelemetry +func SetupTelemetry(opts ...componenttest.TelemetryOption) Telemetry { + return Telemetry{Telemetry: componenttest.NewTelemetry(opts...)} } + +// Deprecated: [v0.119.0] Use metadatatest.NewSettings func (tt *Telemetry) NewSettings() processor.Settings { + return NewSettings(tt.Telemetry) +} + +func NewSettings(tt *componenttest.Telemetry) processor.Settings { set := processortest.NewNopSettings() set.ID = component.NewID(component.MustNewType("odigostrafficmetrics")) set.TelemetrySettings = tt.NewTelemetrySettings() return set } -func (tt *Telemetry) NewTelemetrySettings() component.TelemetrySettings { - set := componenttest.NewNopTelemetrySettings() - set.MeterProvider = tt.meterProvider - set.MetricsLevel = configtelemetry.LevelDetailed - set.TracerProvider = tt.traceProvider - return set -} - +// Deprecated: [v0.119.0] Use metadatatest.AssertEqual* func (tt *Telemetry) AssertMetrics(t *testing.T, expected []metricdata.Metrics, opts ...metricdatatest.Option) { var md metricdata.ResourceMetrics require.NoError(t, tt.Reader.Collect(context.Background(), &md)) // ensure all required metrics are present for _, want := range expected { - got := getMetric(want.Name, md) + got := getMetricFromResource(want.Name, md) metricdatatest.AssertEqual(t, want, got, opts...) } @@ -68,14 +51,103 @@ func (tt *Telemetry) AssertMetrics(t *testing.T, expected []metricdata.Metrics, require.Equal(t, len(expected), lenMetrics(md)) } -func (tt *Telemetry) Shutdown(ctx context.Context) error { - return multierr.Combine( - tt.meterProvider.Shutdown(ctx), - tt.traceProvider.Shutdown(ctx), - ) +func AssertEqualOdigosAcceptedLogRecords(t *testing.T, tt *componenttest.Telemetry, dps []metricdata.DataPoint[int64], opts ...metricdatatest.Option) { + want := metricdata.Metrics{ + Name: "otelcol_odigos_accepted_log_records", + Description: "Number of log records passed through the processor.", + Unit: "{records}", + Data: metricdata.Sum[int64]{ + Temporality: metricdata.CumulativeTemporality, + IsMonotonic: true, + DataPoints: dps, + }, + } + got, err := tt.GetMetric("otelcol_odigos_accepted_log_records") + require.NoError(t, err) + metricdatatest.AssertEqual(t, want, got, opts...) +} + +func AssertEqualOdigosAcceptedMetricPoints(t *testing.T, tt *componenttest.Telemetry, dps []metricdata.DataPoint[int64], opts ...metricdatatest.Option) { + want := metricdata.Metrics{ + Name: "otelcol_odigos_accepted_metric_points", + Description: "Number of data points passed through the processor.", + Unit: "{datapoints}", + Data: metricdata.Sum[int64]{ + Temporality: metricdata.CumulativeTemporality, + IsMonotonic: true, + DataPoints: dps, + }, + } + got, err := tt.GetMetric("otelcol_odigos_accepted_metric_points") + require.NoError(t, err) + metricdatatest.AssertEqual(t, want, got, opts...) +} + +func AssertEqualOdigosAcceptedSpans(t *testing.T, tt *componenttest.Telemetry, dps []metricdata.DataPoint[int64], opts ...metricdatatest.Option) { + want := metricdata.Metrics{ + Name: "otelcol_odigos_accepted_spans", + Description: "Number of spans passed through the processor.", + Unit: "{spans}", + Data: metricdata.Sum[int64]{ + Temporality: metricdata.CumulativeTemporality, + IsMonotonic: true, + DataPoints: dps, + }, + } + got, err := tt.GetMetric("otelcol_odigos_accepted_spans") + require.NoError(t, err) + metricdatatest.AssertEqual(t, want, got, opts...) +} + +func AssertEqualOdigosLogDataSize(t *testing.T, tt *componenttest.Telemetry, dps []metricdata.DataPoint[int64], opts ...metricdatatest.Option) { + want := metricdata.Metrics{ + Name: "otelcol_odigos_log_data_size", + Description: "Total size of log data passed to the processor", + Unit: "By", + Data: metricdata.Sum[int64]{ + Temporality: metricdata.CumulativeTemporality, + IsMonotonic: true, + DataPoints: dps, + }, + } + got, err := tt.GetMetric("otelcol_odigos_log_data_size") + require.NoError(t, err) + metricdatatest.AssertEqual(t, want, got, opts...) +} + +func AssertEqualOdigosMetricDataSize(t *testing.T, tt *componenttest.Telemetry, dps []metricdata.DataPoint[int64], opts ...metricdatatest.Option) { + want := metricdata.Metrics{ + Name: "otelcol_odigos_metric_data_size", + Description: "Total size of metric data passed to the processor", + Unit: "By", + Data: metricdata.Sum[int64]{ + Temporality: metricdata.CumulativeTemporality, + IsMonotonic: true, + DataPoints: dps, + }, + } + got, err := tt.GetMetric("otelcol_odigos_metric_data_size") + require.NoError(t, err) + metricdatatest.AssertEqual(t, want, got, opts...) +} + +func AssertEqualOdigosTraceDataSize(t *testing.T, tt *componenttest.Telemetry, dps []metricdata.DataPoint[int64], opts ...metricdatatest.Option) { + want := metricdata.Metrics{ + Name: "otelcol_odigos_trace_data_size", + Description: "Total size of trace data passed to the processor", + Unit: "By", + Data: metricdata.Sum[int64]{ + Temporality: metricdata.CumulativeTemporality, + IsMonotonic: true, + DataPoints: dps, + }, + } + got, err := tt.GetMetric("otelcol_odigos_trace_data_size") + require.NoError(t, err) + metricdatatest.AssertEqual(t, want, got, opts...) } -func getMetric(name string, got metricdata.ResourceMetrics) metricdata.Metrics { +func getMetricFromResource(name string, got metricdata.ResourceMetrics) metricdata.Metrics { for _, sm := range got.ScopeMetrics { for _, m := range sm.Metrics { if m.Name == name { diff --git a/collector/processors/odigostrafficmetrics/internal/metadatatest/generated_telemetrytest_test.go b/collector/processors/odigostrafficmetrics/internal/metadatatest/generated_telemetrytest_test.go index fa1d38fa2f..34a3bf7a4a 100644 --- a/collector/processors/odigostrafficmetrics/internal/metadatatest/generated_telemetrytest_test.go +++ b/collector/processors/odigostrafficmetrics/internal/metadatatest/generated_telemetrytest_test.go @@ -14,11 +14,9 @@ import ( func TestSetupTelemetry(t *testing.T) { testTel := SetupTelemetry() - tb, err := metadata.NewTelemetryBuilder( - testTel.NewTelemetrySettings(), - ) + tb, err := metadata.NewTelemetryBuilder(testTel.NewTelemetrySettings()) require.NoError(t, err) - require.NotNil(t, tb) + defer tb.Shutdown() tb.OdigosAcceptedLogRecords.Add(context.Background(), 1) tb.OdigosAcceptedMetricPoints.Add(context.Background(), 1) tb.OdigosAcceptedSpans.Add(context.Background(), 1) @@ -100,5 +98,24 @@ func TestSetupTelemetry(t *testing.T) { }, }, }, metricdatatest.IgnoreTimestamp(), metricdatatest.IgnoreValue()) + AssertEqualOdigosAcceptedLogRecords(t, testTel.Telemetry, + []metricdata.DataPoint[int64]{{Value: 1}}, + metricdatatest.IgnoreTimestamp()) + AssertEqualOdigosAcceptedMetricPoints(t, testTel.Telemetry, + []metricdata.DataPoint[int64]{{Value: 1}}, + metricdatatest.IgnoreTimestamp()) + AssertEqualOdigosAcceptedSpans(t, testTel.Telemetry, + []metricdata.DataPoint[int64]{{Value: 1}}, + metricdatatest.IgnoreTimestamp()) + AssertEqualOdigosLogDataSize(t, testTel.Telemetry, + []metricdata.DataPoint[int64]{{Value: 1}}, + metricdatatest.IgnoreTimestamp()) + AssertEqualOdigosMetricDataSize(t, testTel.Telemetry, + []metricdata.DataPoint[int64]{{Value: 1}}, + metricdatatest.IgnoreTimestamp()) + AssertEqualOdigosTraceDataSize(t, testTel.Telemetry, + []metricdata.DataPoint[int64]{{Value: 1}}, + metricdatatest.IgnoreTimestamp()) + require.NoError(t, testTel.Shutdown(context.Background())) } diff --git a/collector/providers/odigosfileprovider/go.mod b/collector/providers/odigosfileprovider/go.mod index ad6b4427c6..2f95d0571f 100644 --- a/collector/providers/odigosfileprovider/go.mod +++ b/collector/providers/odigosfileprovider/go.mod @@ -4,7 +4,7 @@ go 1.23.0 require ( github.com/fsnotify/fsnotify v1.8.0 - go.opentelemetry.io/collector/confmap v1.24.0 + go.opentelemetry.io/collector/confmap v1.25.0 go.uber.org/zap v1.27.0 ) diff --git a/collector/providers/odigosfileprovider/go.sum b/collector/providers/odigosfileprovider/go.sum index c8762f92cb..b78da2a187 100644 --- a/collector/providers/odigosfileprovider/go.sum +++ b/collector/providers/odigosfileprovider/go.sum @@ -24,8 +24,8 @@ github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o= github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -go.opentelemetry.io/collector/confmap v1.24.0 h1:UUHVhkDCsVw14jPOarug9PDQE2vaB2ELPWMr7ARFBCA= -go.opentelemetry.io/collector/confmap v1.24.0/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap v1.25.0 h1:dLqd6hF4JqcDHl5GWWhc2jXsHs3hkq3KPvU/2Nw5aN4= +go.opentelemetry.io/collector/confmap v1.25.0/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= diff --git a/frontend/go.mod b/frontend/go.mod index c678a84808..9cba946adc 100644 --- a/frontend/go.mod +++ b/frontend/go.mod @@ -13,16 +13,16 @@ require ( github.com/odigos-io/odigos/k8sutils v0.0.0 github.com/stretchr/testify v1.10.0 github.com/vektah/gqlparser/v2 v2.5.16 - go.opentelemetry.io/collector/component v0.118.0 - go.opentelemetry.io/collector/component/componenttest v0.118.0 - go.opentelemetry.io/collector/confmap v1.24.0 - go.opentelemetry.io/collector/exporter v0.118.0 - go.opentelemetry.io/collector/exporter/exportertest v0.118.0 - go.opentelemetry.io/collector/exporter/otlpexporter v0.118.0 - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.118.0 - go.opentelemetry.io/collector/pdata v1.24.0 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.118.0 - go.opentelemetry.io/collector/receiver/receivertest v0.118.0 + go.opentelemetry.io/collector/component v0.119.0 + go.opentelemetry.io/collector/component/componenttest v0.119.0 + go.opentelemetry.io/collector/confmap v1.25.0 + go.opentelemetry.io/collector/exporter v0.119.0 + go.opentelemetry.io/collector/exporter/exportertest v0.119.0 + go.opentelemetry.io/collector/exporter/otlpexporter v0.119.0 + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.119.0 + go.opentelemetry.io/collector/pdata v1.25.0 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.119.0 + go.opentelemetry.io/collector/receiver/receivertest v0.119.0 go.opentelemetry.io/otel v1.34.0 golang.org/x/sync v0.10.0 k8s.io/api v0.32.1 @@ -48,30 +48,30 @@ require ( github.com/mostynb/go-grpc-compression v1.2.3 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/rs/cors v1.11.1 // indirect - go.opentelemetry.io/collector v0.118.0 // indirect - go.opentelemetry.io/collector/config/configauth v0.118.0 // indirect - go.opentelemetry.io/collector/config/configcompression v1.24.0 // indirect - go.opentelemetry.io/collector/config/configgrpc v0.118.0 // indirect - go.opentelemetry.io/collector/config/confighttp v0.118.0 // indirect - go.opentelemetry.io/collector/config/confignet v1.24.0 // indirect - go.opentelemetry.io/collector/config/configopaque v1.24.0 // indirect - go.opentelemetry.io/collector/config/configretry v1.24.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.118.0 // indirect - go.opentelemetry.io/collector/config/configtls v1.24.0 // indirect - go.opentelemetry.io/collector/consumer v1.24.0 - go.opentelemetry.io/collector/extension v0.118.0 // indirect - go.opentelemetry.io/collector/extension/auth v0.118.0 // indirect - go.opentelemetry.io/collector/featuregate v1.24.0 // indirect - go.opentelemetry.io/collector/receiver v0.118.0 // indirect + go.opentelemetry.io/collector v0.119.0 // indirect + go.opentelemetry.io/collector/config/configauth v0.119.0 // indirect + go.opentelemetry.io/collector/config/configcompression v1.25.0 // indirect + go.opentelemetry.io/collector/config/configgrpc v0.119.0 // indirect + go.opentelemetry.io/collector/config/confighttp v0.119.0 // indirect + go.opentelemetry.io/collector/config/confignet v1.25.0 // indirect + go.opentelemetry.io/collector/config/configopaque v1.25.0 // indirect + go.opentelemetry.io/collector/config/configretry v1.25.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.119.0 // indirect + go.opentelemetry.io/collector/config/configtls v1.25.0 // indirect + go.opentelemetry.io/collector/consumer v1.25.0 + go.opentelemetry.io/collector/extension v0.119.0 // indirect + go.opentelemetry.io/collector/extension/auth v0.119.0 // indirect + go.opentelemetry.io/collector/featuregate v1.25.0 // indirect + go.opentelemetry.io/collector/receiver v0.119.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect go.opentelemetry.io/otel/metric v1.34.0 // indirect go.opentelemetry.io/otel/sdk v1.34.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.34.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect - google.golang.org/grpc v1.69.4 // indirect + google.golang.org/grpc v1.70.0 // indirect ) require ( @@ -122,20 +122,20 @@ require ( github.com/ugorji/go/codec v1.2.12 // indirect github.com/x448/float16 v0.8.4 // indirect go.opentelemetry.io/auto/sdk v1.1.0 // indirect - go.opentelemetry.io/collector/client v1.24.0 // indirect - go.opentelemetry.io/collector/component/componentstatus v0.118.0 // indirect - go.opentelemetry.io/collector/consumer/consumererror v0.118.0 // indirect - go.opentelemetry.io/collector/consumer/consumererror/xconsumererror v0.118.0 // indirect - go.opentelemetry.io/collector/consumer/consumertest v0.118.0 // indirect - go.opentelemetry.io/collector/consumer/xconsumer v0.118.0 // indirect - go.opentelemetry.io/collector/exporter/exporterhelper/xexporterhelper v0.118.0 // indirect - go.opentelemetry.io/collector/exporter/xexporter v0.118.0 // indirect - go.opentelemetry.io/collector/extension/xextension v0.118.0 // indirect - go.opentelemetry.io/collector/internal/sharedcomponent v0.118.0 // indirect - go.opentelemetry.io/collector/pdata/pprofile v0.118.0 // indirect - go.opentelemetry.io/collector/pipeline v0.118.0 // indirect - go.opentelemetry.io/collector/pipeline/xpipeline v0.118.0 // indirect - go.opentelemetry.io/collector/receiver/xreceiver v0.118.0 // indirect + go.opentelemetry.io/collector/client v1.25.0 // indirect + go.opentelemetry.io/collector/component/componentstatus v0.119.0 // indirect + go.opentelemetry.io/collector/consumer/consumererror v0.119.0 // indirect + go.opentelemetry.io/collector/consumer/consumererror/xconsumererror v0.119.0 // indirect + go.opentelemetry.io/collector/consumer/consumertest v0.119.0 // indirect + go.opentelemetry.io/collector/consumer/xconsumer v0.119.0 // indirect + go.opentelemetry.io/collector/exporter/exporterhelper/xexporterhelper v0.119.0 // indirect + go.opentelemetry.io/collector/exporter/xexporter v0.119.0 // indirect + go.opentelemetry.io/collector/extension/xextension v0.119.0 // indirect + go.opentelemetry.io/collector/internal/sharedcomponent v0.119.0 // indirect + go.opentelemetry.io/collector/pdata/pprofile v0.119.0 // indirect + go.opentelemetry.io/collector/pipeline v0.119.0 // indirect + go.opentelemetry.io/collector/pipeline/xpipeline v0.119.0 // indirect + go.opentelemetry.io/collector/receiver/xreceiver v0.119.0 // indirect go.opentelemetry.io/otel/trace v1.34.0 // indirect golang.org/x/arch v0.12.0 // indirect golang.org/x/crypto v0.32.0 // indirect @@ -146,7 +146,7 @@ require ( golang.org/x/text v0.21.0 // indirect golang.org/x/time v0.7.0 // indirect golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect - google.golang.org/protobuf v1.36.3 // indirect + google.golang.org/protobuf v1.36.4 // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/frontend/go.sum b/frontend/go.sum index 9a14b614e8..55de85185a 100644 --- a/frontend/go.sum +++ b/frontend/go.sum @@ -202,94 +202,94 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/collector v0.118.0 h1:OBqxppK9Ul6bzEabcHsx11pXwgp05sBpqYxIxiOkyFo= -go.opentelemetry.io/collector v0.118.0/go.mod h1:yxfijW5k9dwd9sifTBAEoItE+ahFEtOlyvex1B99uno= -go.opentelemetry.io/collector/client v1.24.0 h1:eH7ctqDnRWNH5QVVbAvdYYdkvr8QWLkEm8FUPaaYbWE= -go.opentelemetry.io/collector/client v1.24.0/go.mod h1:C/38SYPa0tTL6ikPz/glYz6f3GVzEuT4nlEml6IBDMw= -go.opentelemetry.io/collector/component v0.118.0 h1:sSO/ObxJ+yH77Z4DmT1mlSuxhbgUmY1ztt7xCA1F/8w= -go.opentelemetry.io/collector/component v0.118.0/go.mod h1:LUJ3AL2b+tmFr3hZol3hzKzCMvNdqNq0M5CF3SWdv4M= -go.opentelemetry.io/collector/component/componentstatus v0.118.0 h1:1aCIdUjqz0noKNQr1v04P+lwF89Lkua5U7BhH9IAxkE= -go.opentelemetry.io/collector/component/componentstatus v0.118.0/go.mod h1:ynO1Nyj0t1h6x/djIMJy35bhnnWEc2mlQaFgDNUO504= -go.opentelemetry.io/collector/component/componenttest v0.118.0 h1:knEHckoiL2fEWSIc0iehg39zP4IXzi9sHa45O+oxKo8= -go.opentelemetry.io/collector/component/componenttest v0.118.0/go.mod h1:aHc7t7zVwCpbhrWIWY+GMuaMxMCUP8C8P7pJOt8r/vU= -go.opentelemetry.io/collector/config/configauth v0.118.0 h1:uBH/s9kRw/m7VWuibrkCzbXSCVLf9ElKq9NuKb0wAwk= -go.opentelemetry.io/collector/config/configauth v0.118.0/go.mod h1:uAmSGkihIENoIah6mEQ8S/HX4oiFOHZu3EoZLZwi9OI= -go.opentelemetry.io/collector/config/configcompression v1.24.0 h1:jyM6BX7wYcrh+eVSC0FMbWgy/zb9iP58SerOrvisccE= -go.opentelemetry.io/collector/config/configcompression v1.24.0/go.mod h1:LvYG00tbPTv0NOLoZN0wXq1F5thcxvukO8INq7xyfWU= -go.opentelemetry.io/collector/config/configgrpc v0.118.0 h1:if8VfsnnHwVX/E+GgehVXKh85YtAtVci+c4A/M5gPh0= -go.opentelemetry.io/collector/config/configgrpc v0.118.0/go.mod h1:TZqpu5s/iEW5XmhSnzrhXCUQ3W5qaICNvlllBf3GGcw= -go.opentelemetry.io/collector/config/confighttp v0.118.0 h1:ey50dfySOCPgUPJ1x8Kq6CmNcv/TpZHt6cYmPhZItj0= -go.opentelemetry.io/collector/config/confighttp v0.118.0/go.mod h1:4frheVFiIfKUHuD/KAPn+u+d+EUx5GlQTNmoI1ftReA= -go.opentelemetry.io/collector/config/confignet v1.24.0 h1:Je1oO3qCUI4etX9ZVyav/NkeD+sfzZQRmwMGy51Oei4= -go.opentelemetry.io/collector/config/confignet v1.24.0/go.mod h1:ZppUH1hgUJOubawEsxsQ9MzEYFytqo2GnVSS7d4CVxc= -go.opentelemetry.io/collector/config/configopaque v1.24.0 h1:EPOprMDreZPKyIgT0/eVBvEGQVvq7ncvBCBVnWerj54= -go.opentelemetry.io/collector/config/configopaque v1.24.0/go.mod h1:sW0t0iI/VfRL9VYX7Ik6XzVgPcR+Y5kejTLsYcMyDWs= -go.opentelemetry.io/collector/config/configretry v1.24.0 h1:sIPHhNNY2YlHMIJ//63iMxIqlgDeGczId0uUb1njsPM= -go.opentelemetry.io/collector/config/configretry v1.24.0/go.mod h1:cleBc9I0DIWpTiiHfu9v83FUaCTqcPXmebpLxjEIqro= -go.opentelemetry.io/collector/config/configtelemetry v0.118.0 h1:UlN46EViG2X42odWtXgWaqY7Y01ZKpsnswSwXTWx5mM= -go.opentelemetry.io/collector/config/configtelemetry v0.118.0/go.mod h1:SlBEwQg0qly75rXZ6W1Ig8jN25KBVBkFIIAUI1GiAAE= -go.opentelemetry.io/collector/config/configtls v1.24.0 h1:rOhl8qjIlUVVRHnwQj6/vZe6cuCYImyx7aVDBR35bqI= -go.opentelemetry.io/collector/config/configtls v1.24.0/go.mod h1:d0OdfkbuYEMYDBJLSbpH0wPI29lmSiFT3geqh/ygF2k= -go.opentelemetry.io/collector/confmap v1.24.0 h1:UUHVhkDCsVw14jPOarug9PDQE2vaB2ELPWMr7ARFBCA= -go.opentelemetry.io/collector/confmap v1.24.0/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= -go.opentelemetry.io/collector/consumer v1.24.0 h1:7DeyBm9qdr1EPuCfPjWyChPK16DbVc0wZeSa9LZprFU= -go.opentelemetry.io/collector/consumer v1.24.0/go.mod h1:0G6jvZprIp4dpKMD1ZxCjriiP9GdFvFMObsQEtTk71s= -go.opentelemetry.io/collector/consumer/consumererror v0.118.0 h1:Cx//ZFDa6wUEoRDRYRZ/Rkb52dWNoHj2e9FdlcM9jCA= -go.opentelemetry.io/collector/consumer/consumererror v0.118.0/go.mod h1:2mhnzzLYR5zS2Zz4h9ZnRM8Uogu9qatcfQwGNenhing= -go.opentelemetry.io/collector/consumer/consumererror/xconsumererror v0.118.0 h1:/kkWdw1PQtPb1noZMTt6tbgP1ntWdJ835u1o45nYhTg= -go.opentelemetry.io/collector/consumer/consumererror/xconsumererror v0.118.0/go.mod h1:2mdXnTT0nPd/KTG9w29cc1OGKBLzL2HW+x/o7QVpCpI= -go.opentelemetry.io/collector/consumer/consumertest v0.118.0 h1:8AAS9ejQapP1zqt0+cI6u+AUBheT3X0171N9WtXWsVY= -go.opentelemetry.io/collector/consumer/consumertest v0.118.0/go.mod h1:spRM2wyGr4QZzqMHlLmZnqRCxqXN4Wd0piogC4Qb5PQ= -go.opentelemetry.io/collector/consumer/xconsumer v0.118.0 h1:guWnzzRqgCInjnYlOQ1BPrimppNGIVvnknAjlIbWXuY= -go.opentelemetry.io/collector/consumer/xconsumer v0.118.0/go.mod h1:C5V2d6Ys/Fi6k3tzjBmbdZ9v3J/rZSAMlhx4KVcMIIg= -go.opentelemetry.io/collector/exporter v0.118.0 h1:PE0vF2U+znOB8OVLPWNw40bGCoT/5QquQ8Xbz4i9Rb0= -go.opentelemetry.io/collector/exporter v0.118.0/go.mod h1:5ST3gxT/RzE/vg2bcGDtWJxlQF1ypwk50UpmdK1kUqY= -go.opentelemetry.io/collector/exporter/exporterhelper/xexporterhelper v0.118.0 h1:wC4IyE98DR4eXVyT7EnA4iJ6s+sbUTZVq/5KoVWSKDw= -go.opentelemetry.io/collector/exporter/exporterhelper/xexporterhelper v0.118.0/go.mod h1:spjZv9QX+pCcx/ECSqlo/UKCYJzp2rR5NsvIgpfdUxQ= -go.opentelemetry.io/collector/exporter/exportertest v0.118.0 h1:8gWky42BcJsxoaqWbnqCDUjP3Y84hjC6RD/UWHwR7sI= -go.opentelemetry.io/collector/exporter/exportertest v0.118.0/go.mod h1:UbpQBZvznA8YPqqcKlafVIhB6Qa4fPf2+I67MUGyNqo= -go.opentelemetry.io/collector/exporter/otlpexporter v0.118.0 h1:kfVfskZEroh3zs8HmdCLeo9weAJT5oedd+04McXEBSU= -go.opentelemetry.io/collector/exporter/otlpexporter v0.118.0/go.mod h1:iyvbf05lZdh+KObvNF0uEpaaV9YoQNofm1RRamWbq78= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.118.0 h1:8ShK60uf6nY6TlSYBZ2Y7eh3sv0WwNkUKgmh3P1U/2U= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.118.0/go.mod h1:UJXry//sSRs04eg35nZkT1wxP43tPxz/3wbf26eLRkc= -go.opentelemetry.io/collector/exporter/xexporter v0.118.0 h1:PZAo1CFhZHfQwtzUNj+Fwcv/21pWHJHTsrIddD096fw= -go.opentelemetry.io/collector/exporter/xexporter v0.118.0/go.mod h1:x4J+qyrRcp4DfWKqK3DLZomFTIUhedsqCQWqq6Gqps4= -go.opentelemetry.io/collector/extension v0.118.0 h1:9o5jLCTRvs0+rtFDx04zTBuB4WFrE0RvtVCPovYV0sA= -go.opentelemetry.io/collector/extension v0.118.0/go.mod h1:BFwB0WOlse6JnrStO44+k9kwUVjjtseFEHhJLHD7lBg= -go.opentelemetry.io/collector/extension/auth v0.118.0 h1:+eMNUBUK1JK9A3mr95BasbWE90Lxu+WlR9sqS36sJms= -go.opentelemetry.io/collector/extension/auth v0.118.0/go.mod h1:MJpYcRGSERkgOhczqTKoAhkHmcugr+YTlRhc/SpYYYI= -go.opentelemetry.io/collector/extension/auth/authtest v0.118.0 h1:KIORXNc71vfpQrrZOntiZesRCZtQ8alrASWVT/zZkyo= -go.opentelemetry.io/collector/extension/auth/authtest v0.118.0/go.mod h1:0ZlSP9NPAfTRQd6Tx4mOH0IWrp6ufHaVN//L9Mb87gM= -go.opentelemetry.io/collector/extension/extensiontest v0.118.0 h1:rKBUaFS9elGfENG45wANmrwx7mHsmt1+YWCzxjftElg= -go.opentelemetry.io/collector/extension/extensiontest v0.118.0/go.mod h1:CqNXzkIOR32D8EUpptpOXhpFkibs3kFlRyNMEgIW8l4= -go.opentelemetry.io/collector/extension/xextension v0.118.0 h1:P6gvJzqnH9ma2QfnWde/E6Xu9bAzuefzIwm5iupiVPE= -go.opentelemetry.io/collector/extension/xextension v0.118.0/go.mod h1:ne4Q8ZtRlbC0Etr2hTcVkjOpVM2bE2xy1u+R80LUkDw= -go.opentelemetry.io/collector/featuregate v1.24.0 h1:DEqDsuJgxjZ3E5JNC9hXCd4sWGFiF7h9kaziODuqwFY= -go.opentelemetry.io/collector/featuregate v1.24.0/go.mod h1:3GaXqflNDVwWndNGBJ1+XJFy3Fv/XrFgjMN60N3z7yg= -go.opentelemetry.io/collector/internal/sharedcomponent v0.118.0 h1:aCiwkzBL4VyPEUBmEcTnoPyld5EClJGbwyUNJhHNgEo= -go.opentelemetry.io/collector/internal/sharedcomponent v0.118.0/go.mod h1:drV6vD4acelEUOjM9cgxV5ILs8q2AYUh3EV+Pljdorg= -go.opentelemetry.io/collector/pdata v1.24.0 h1:D6j92eAzmAbQgivNBUnt8r9juOl8ugb+ihYynoFZIEg= -go.opentelemetry.io/collector/pdata v1.24.0/go.mod h1:cf3/W9E/uIvPS4MR26SnMFJhraUCattzzM6qusuONuc= -go.opentelemetry.io/collector/pdata/pprofile v0.118.0 h1:VK/fr65VFOwEhsSGRPj5c3lCv0yIK1Kt0sZxv9WZBb8= -go.opentelemetry.io/collector/pdata/pprofile v0.118.0/go.mod h1:eJyP/vBm179EghV3dPSnamGAWQwLyd+4z/3yG54YFoQ= -go.opentelemetry.io/collector/pdata/testdata v0.118.0 h1:5N0w1SX9KIRkwvtkrpzQgXy9eGk3vfNG0ds6mhEPMIM= -go.opentelemetry.io/collector/pdata/testdata v0.118.0/go.mod h1:UY+GHV5bOC1BnFburOZ0wiHReJj1XbW12mi2Ogbc5Lw= -go.opentelemetry.io/collector/pipeline v0.118.0 h1:RI1DMe7L0+5hGkx0EDGxG00TaJoh96MEQppgOlGx1Oc= -go.opentelemetry.io/collector/pipeline v0.118.0/go.mod h1:qE3DmoB05AW0C3lmPvdxZqd/H4po84NPzd5MrqgtL74= -go.opentelemetry.io/collector/pipeline/xpipeline v0.118.0 h1:ZUVF1MYNQYZvmuL30KfP+QbVGSbFZvldBM9hgCe4J4k= -go.opentelemetry.io/collector/pipeline/xpipeline v0.118.0/go.mod h1:XgG1ktGO9J1f6fasMYPWSXL9Raan/VYB9vddKKWp5hQ= -go.opentelemetry.io/collector/receiver v0.118.0 h1:X4mspHmbbtwdCQZ7o370kNmdWfxRnK1FrsvEShCCKEc= -go.opentelemetry.io/collector/receiver v0.118.0/go.mod h1:wFyfu6sgrkDPLQoGOGMuChGZzkZnYcI/tPJWV4CRTzs= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.118.0 h1:Nud8aaRDb86K2kBeqMTjqAKDUV00JDn+G4wUZ3hDlAk= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.118.0/go.mod h1:MJvDEzWJnm1FMoIoTKmhlT3pPmwJP+65GKWy0lAzd30= -go.opentelemetry.io/collector/receiver/receivertest v0.118.0 h1:XlMr2mPsyXJsMUOqCpEoY3uCPsLZQbNA5fmVNDGB7Bw= -go.opentelemetry.io/collector/receiver/receivertest v0.118.0/go.mod h1:dtu/H1RNjhy11hTVf/XUfc02uGufMhYYdhhYBbglcUg= -go.opentelemetry.io/collector/receiver/xreceiver v0.118.0 h1:dzECve9e0H3ot0JWnWPuQr9Y84RhOYSd0+CjvJskx7Y= -go.opentelemetry.io/collector/receiver/xreceiver v0.118.0/go.mod h1:Lv1nD/mSYSP64iV8k+C+mWWZZOMLRubv9d1SUory3/E= +go.opentelemetry.io/collector v0.119.0 h1:n8ltRLteaUKjyY3E+3JbiaPG4gwL2pjNIcUvXmRA0Ko= +go.opentelemetry.io/collector v0.119.0/go.mod h1:w+qO3hp/mLR2wL4v06MWonGcj4p2/kPSNcU3R7+06p8= +go.opentelemetry.io/collector/client v1.25.0 h1:7IS+b3Xm2ymgmQj9UbnZmVF4jIw6F7tQjJP7lFc+GoM= +go.opentelemetry.io/collector/client v1.25.0/go.mod h1:IPyOnO7K0ztuZOV1i+WXShvq4tpbLp45tTDdIDvlZvM= +go.opentelemetry.io/collector/component v0.119.0 h1:ZVp9myF1Bc4BLa1V4C15Jy/VpqKPPhvbxpe9pP1mPMc= +go.opentelemetry.io/collector/component v0.119.0/go.mod h1:wtuWxFl+Ky9E/5+t2FwHoLyADDiBFFDdx8fN3fEs0n8= +go.opentelemetry.io/collector/component/componentstatus v0.119.0 h1:H8isEInGaWhnDfuG1Ax663dlsPgF4aM20sgraM6HmSI= +go.opentelemetry.io/collector/component/componentstatus v0.119.0/go.mod h1:Hr7scHUFPhyT32IkzKq06cdhRH9jMKvnKbDVYRUEnqE= +go.opentelemetry.io/collector/component/componenttest v0.119.0 h1:nVlBmKSu56zO/qCcNgDYCQsRoWAL+NPkrkIPAbapdQM= +go.opentelemetry.io/collector/component/componenttest v0.119.0/go.mod h1:H6KVzLkNhB/deEijLcq91Kjgs9Oshx2ZsFAwaMcuTLs= +go.opentelemetry.io/collector/config/configauth v0.119.0 h1:w/Ln2l6TSgadtRLEZ7mlmOsW/6Q4ITIrjwxR7Tbnfzg= +go.opentelemetry.io/collector/config/configauth v0.119.0/go.mod h1:B3DFUBTSGdwAjxbWtY/tQ+03QwousCMLM9s26+Kb9Xw= +go.opentelemetry.io/collector/config/configcompression v1.25.0 h1:iYeeYiKbTQu9lqWDpszeAc5gRkWBImDrBVe7u5gnoqw= +go.opentelemetry.io/collector/config/configcompression v1.25.0/go.mod h1:LvYG00tbPTv0NOLoZN0wXq1F5thcxvukO8INq7xyfWU= +go.opentelemetry.io/collector/config/configgrpc v0.119.0 h1:h3Fn5xzGSeSC721rbBhZDxTY5Z1sSSqQRdjR2LXnUZM= +go.opentelemetry.io/collector/config/configgrpc v0.119.0/go.mod h1:JkPHSM0clFA2bD85zQ8DuEyH4BFiB+wCZbr1aqbCLkY= +go.opentelemetry.io/collector/config/confighttp v0.119.0 h1:slt4Msm2D4qdu2Nvy2E+ccgrAS0T64zl6eTuWiiCxGg= +go.opentelemetry.io/collector/config/confighttp v0.119.0/go.mod h1:Tnfo1UP1OZPVfvYriaP187aS3FHfwVXNLjBZ799AUFk= +go.opentelemetry.io/collector/config/confignet v1.25.0 h1:DteOIhwvXkmGhqggKU/s0qfjpVW21TGku1vM2S0xArY= +go.opentelemetry.io/collector/config/confignet v1.25.0/go.mod h1:ZppUH1hgUJOubawEsxsQ9MzEYFytqo2GnVSS7d4CVxc= +go.opentelemetry.io/collector/config/configopaque v1.25.0 h1:raFi+CC8Sn4KzKCPhtnnrnkDQ0eFzJCN8xJpQh9d1sU= +go.opentelemetry.io/collector/config/configopaque v1.25.0/go.mod h1:sW0t0iI/VfRL9VYX7Ik6XzVgPcR+Y5kejTLsYcMyDWs= +go.opentelemetry.io/collector/config/configretry v1.25.0 h1:PelzRkTJ9zGxwdJha7pPtvR91GrgL/OzkY/MwyXYRUE= +go.opentelemetry.io/collector/config/configretry v1.25.0/go.mod h1:cleBc9I0DIWpTiiHfu9v83FUaCTqcPXmebpLxjEIqro= +go.opentelemetry.io/collector/config/configtelemetry v0.119.0 h1:gAgMUEVXZKgpASxOrhS55DyA/aYatq0U6gitZI8MLXw= +go.opentelemetry.io/collector/config/configtelemetry v0.119.0/go.mod h1:SlBEwQg0qly75rXZ6W1Ig8jN25KBVBkFIIAUI1GiAAE= +go.opentelemetry.io/collector/config/configtls v1.25.0 h1:x915Us8mhYWGB025LBMH8LT9ZPdvg2WKAyCQ7IDUSfw= +go.opentelemetry.io/collector/config/configtls v1.25.0/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= +go.opentelemetry.io/collector/confmap v1.25.0 h1:dLqd6hF4JqcDHl5GWWhc2jXsHs3hkq3KPvU/2Nw5aN4= +go.opentelemetry.io/collector/confmap v1.25.0/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/consumer v1.25.0 h1:qCJa7Hh7lY3vYWgwcEgTGSjjITLCn+BSsya8LxjpoPY= +go.opentelemetry.io/collector/consumer v1.25.0/go.mod h1:ToBfr3BexnhHuxC8/XszkKP/YtkgsGd0yjFMQXNwvT8= +go.opentelemetry.io/collector/consumer/consumererror v0.119.0 h1:M6QXK3KLWnNLlUWOBgz+WQI//W9M8r9qVGWUA3mc5LM= +go.opentelemetry.io/collector/consumer/consumererror v0.119.0/go.mod h1:UNnNkr+ZQJhAMNE5v1n86lXbJrSYb+1ePcI98gV6xvo= +go.opentelemetry.io/collector/consumer/consumererror/xconsumererror v0.119.0 h1:T/H7NcNIPKnCPlM5rObxPR+907ayTTXnyWiuMjL7Hsg= +go.opentelemetry.io/collector/consumer/consumererror/xconsumererror v0.119.0/go.mod h1:k03ncJ8V0QFKqwD4ELNyvFx3pMs2uaCErbIn06N9YLo= +go.opentelemetry.io/collector/consumer/consumertest v0.119.0 h1:hZxdlvfOBzy/rl6mIyrannM4M+7zyv7C947f6W9Leio= +go.opentelemetry.io/collector/consumer/consumertest v0.119.0/go.mod h1:pfXxA2CCwbieymnX0ShZuHjwrWzmxJapsb8ZiSqojVc= +go.opentelemetry.io/collector/consumer/xconsumer v0.119.0 h1:s9DrRdb1kYXy2psr34zGG5sI+F4GRBIhjvEsh7C7FtE= +go.opentelemetry.io/collector/consumer/xconsumer v0.119.0/go.mod h1:3fvk+0hd4WMv76+oUUNah0rQ35dZzH3zyMMCg9MtsuY= +go.opentelemetry.io/collector/exporter v0.119.0 h1:eVHmkeB5HQY/FcoP62l7O4Q0cAZ97LwLhZiAQoQeBtU= +go.opentelemetry.io/collector/exporter v0.119.0/go.mod h1:xMF9mT01tXHX2NjfMRV8o9YyhPBZOR4Wt+srkTy1thM= +go.opentelemetry.io/collector/exporter/exporterhelper/xexporterhelper v0.119.0 h1:KS7W2zWVd34Q0BF6tek0hXNEhWHxTr84O+u4xG6a7FM= +go.opentelemetry.io/collector/exporter/exporterhelper/xexporterhelper v0.119.0/go.mod h1:eKijsOVkLOuu9lbqx86Mua8PqURnpxOdPo/5grKGHOg= +go.opentelemetry.io/collector/exporter/exportertest v0.119.0 h1:saABJIiyYyqWEBvGe2VVf5rMMpHdwB83nD6feNZ33nA= +go.opentelemetry.io/collector/exporter/exportertest v0.119.0/go.mod h1:S82pMkj1gWdivxVRKqaRJvGMgVRntKVI5dWAgs23KI8= +go.opentelemetry.io/collector/exporter/otlpexporter v0.119.0 h1:+Ic7h40EOUPbgDnJzVRns5IjxQBKP8Svn4VeIu1Cnj4= +go.opentelemetry.io/collector/exporter/otlpexporter v0.119.0/go.mod h1:TZMlSFncZ6w7NwEEwElB5QGUNIYZb2SMfmUVajxTctw= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.119.0 h1:Hyld/aXva2sPrTchpL9w6QmJVekQcgAO4c3mNbDMi78= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.119.0/go.mod h1:U3S1yKDcyb0pP7Xs/SGWWBw4nEzW1KIoBtzYn3CE5TY= +go.opentelemetry.io/collector/exporter/xexporter v0.119.0 h1:bCUFRa/of+iPrJoXyzJ5cbOv/hWDHw87bnDRFQJ/JVU= +go.opentelemetry.io/collector/exporter/xexporter v0.119.0/go.mod h1:naV2XoiJv8bvOt7Vs9h6aDWmJnuD1SRnDqkIFRINYlI= +go.opentelemetry.io/collector/extension v0.119.0 h1:Itkt3jqYLjkhoX4kWhICuhXQEQz332W7UL6DpmaNHMc= +go.opentelemetry.io/collector/extension v0.119.0/go.mod h1:yMpvs58Z9F3UpSoE4w/1q/EEKlLFZBOQ2muzzikRvO8= +go.opentelemetry.io/collector/extension/auth v0.119.0 h1:URPkjeo3aKmlYGgeFCZK6kLK+D1XGfDUGSAwFaHn+QQ= +go.opentelemetry.io/collector/extension/auth v0.119.0/go.mod h1:8mGcTLfgmf2QNrdumP7g7nnNtyrpHiPRZect1tdXYJQ= +go.opentelemetry.io/collector/extension/auth/authtest v0.119.0 h1:J3oqlamxI+1BvRSxFIOkjMZl2E534YM6y3O8seM0yzE= +go.opentelemetry.io/collector/extension/auth/authtest v0.119.0/go.mod h1:EpUkiFC9siKB/PXeTk9KFutJhZrd6I/AHBM5en4yXlM= +go.opentelemetry.io/collector/extension/extensiontest v0.119.0 h1:sAdIBRJ6Df7jdkHWY/pSEYTersxURkUz9pENKl73n6s= +go.opentelemetry.io/collector/extension/extensiontest v0.119.0/go.mod h1:XQbUTXneJ//xt58eu5ofHhzWQcQ24GRTbBMWHCEsipA= +go.opentelemetry.io/collector/extension/xextension v0.119.0 h1:uSUvha4yxk5jWevhepsQ56QSAOkk3Z4M0vcPEJeZ6UU= +go.opentelemetry.io/collector/extension/xextension v0.119.0/go.mod h1:2DSTP2IEFfCC+2IFzl1eG9bCKsBkxIQjIphziJ0+vuo= +go.opentelemetry.io/collector/featuregate v1.25.0 h1:3b857fvoY9xBcE5qtLUE1/nlQ65teuW9d8CKr6MykYc= +go.opentelemetry.io/collector/featuregate v1.25.0/go.mod h1:3GaXqflNDVwWndNGBJ1+XJFy3Fv/XrFgjMN60N3z7yg= +go.opentelemetry.io/collector/internal/sharedcomponent v0.119.0 h1:A2Pzo2fLewBLyV9CrcUzLMiN63A9WpKsL8QtELU/CCg= +go.opentelemetry.io/collector/internal/sharedcomponent v0.119.0/go.mod h1:r29B+4G7yswJ0JkE+yWH4knPvlBvxIgNuOx6p010u/A= +go.opentelemetry.io/collector/pdata v1.25.0 h1:AmgBklQfbfy0lT8qsoJtRuYMZ7ZV3VZvkvhjSDentrg= +go.opentelemetry.io/collector/pdata v1.25.0/go.mod h1:Zs7D4RXOGS7E2faGc/jfWdbmhoiHBxA7QbpuJOioxq8= +go.opentelemetry.io/collector/pdata/pprofile v0.119.0 h1:sVtv/MhQ3NDLkgHOWDF9BdTtThNyXdOUiz5+poRkYLQ= +go.opentelemetry.io/collector/pdata/pprofile v0.119.0/go.mod h1:ur4388PjUpmwG5HoSMzrLCPkR0gNVLT4lekcJMRPt8A= +go.opentelemetry.io/collector/pdata/testdata v0.119.0 h1:a3OiuLYx7CaEQQ8LxMhPIM804eIGlNM6Pd0XoACXWMI= +go.opentelemetry.io/collector/pdata/testdata v0.119.0/go.mod h1:stCgL1fKOVp93mI4ocHy/xBMhkW3TXr8VetH4X86q8g= +go.opentelemetry.io/collector/pipeline v0.119.0 h1:NebdPIOBIzU7CdOE36hNrCrUML+XOTR9Zsoy43E7MVk= +go.opentelemetry.io/collector/pipeline v0.119.0/go.mod h1:qE3DmoB05AW0C3lmPvdxZqd/H4po84NPzd5MrqgtL74= +go.opentelemetry.io/collector/pipeline/xpipeline v0.119.0 h1:lX70c+MjXHbOJahU6Xs3yV1rPTV/7bWXlCj/C+CnMLc= +go.opentelemetry.io/collector/pipeline/xpipeline v0.119.0/go.mod h1:m2acg7G5Rb8Srm5aK4rD7mUDQhd1r/qXq1DJxdhMAcQ= +go.opentelemetry.io/collector/receiver v0.119.0 h1:ZatoS4POR+XDkN1WwAv18Ism9f/FUsIjtVT4MIZbQS0= +go.opentelemetry.io/collector/receiver v0.119.0/go.mod h1:JUSsVwyKKQVD/Fy3T98OHOlVHE15Z7juba5RQzG3AXc= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.119.0 h1:opx0DmIFTI61hm7dLiAlLJ/+JxY9/gjYnPpfEob0m3U= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.119.0/go.mod h1:kgzvqb2lgZyREX4v16reRgqYPuhKOWtZFGhkI9l6zTo= +go.opentelemetry.io/collector/receiver/receivertest v0.119.0 h1:thZkyftPCNit/m2bUUC+zaR1+hbXoSkCDtNN/vZIZSg= +go.opentelemetry.io/collector/receiver/receivertest v0.119.0/go.mod h1:DZM70vofnquGkQiTfT5ZSFZlohxANl9XOrVq9h5IKnc= +go.opentelemetry.io/collector/receiver/xreceiver v0.119.0 h1:ZcTO+h+r9TyR1XgMhA7FTSTV9RF+z/IDPrcRIg1l56U= +go.opentelemetry.io/collector/receiver/xreceiver v0.119.0/go.mod h1:AkoWhnYFMygK7Tlzez398ti20NqydX8wxPVWU86+baE= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0 h1:rgMkmiGfix9vFJDcDi1PK8WEQP4FLQwLDfhp5ZLpFeE= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0/go.mod h1:ijPqXp5P6IRRByFVVg9DY8P5HkxkHE5ARIa+86aXPf4= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 h1:UP6IpuHFkUgOQL9FFQFrZ+5LiwhhYRbi7VZSIx6Nj5s= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0/go.mod h1:qxuZLtbq5QDtdeSHsS7bcf6EH6uO6jUAgk764zd3rhM= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 h1:CV7UdSGJt/Ao6Gp4CXckLxVRRsRgDHoI8XjbL3PDl8s= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0/go.mod h1:FRmFuRJfag1IZ2dPkHnEoSFVgTVPUd2qf5Vi69hLb8I= go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY= go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI= go.opentelemetry.io/otel/metric v1.34.0 h1:+eTR3U0MyfWjRDhmFMxe2SsW64QrZ84AOhvqS7Y+PoQ= @@ -359,10 +359,10 @@ golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSm golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90= google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f h1:OxYkA3wjPsZyBylwymxSHa7ViiW1Sml4ToBrncvFehI= google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f/go.mod h1:+2Yz8+CLJbIfL9z73EW45avw8Lmge3xVElCP9zEKi50= -google.golang.org/grpc v1.69.4 h1:MF5TftSMkd8GLw/m0KM6V8CMOCY6NZ1NQDPGFgbTt4A= -google.golang.org/grpc v1.69.4/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4= -google.golang.org/protobuf v1.36.3 h1:82DV7MYdb8anAVi3qge1wSnMDrnKK7ebr+I0hHRN1BU= -google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/grpc v1.70.0 h1:pWFv03aZoHzlRKHWicjsZytKAiYCtNS0dHbXnIdq7jQ= +google.golang.org/grpc v1.70.0/go.mod h1:ofIJqVKDXx/JiXrwr2IG4/zwdH9txy3IlF40RmcJSQw= +google.golang.org/protobuf v1.36.4 h1:6A3ZDJHn/eNqc1i+IdefRzy/9PokBTPvcqMySR7NNIM= +google.golang.org/protobuf v1.36.4/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/instrumentor/go.mod b/instrumentor/go.mod index fb70f1f5ac..820764db28 100644 --- a/instrumentor/go.mod +++ b/instrumentor/go.mod @@ -44,7 +44,7 @@ require ( golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect - google.golang.org/grpc v1.69.4 // indirect + google.golang.org/grpc v1.70.0 // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect ) @@ -75,7 +75,7 @@ require ( github.com/pkg/errors v0.9.1 // indirect github.com/prometheus/client_golang v1.20.5 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.61.0 // indirect + github.com/prometheus/common v0.62.0 // indirect github.com/prometheus/procfs v0.15.1 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/stretchr/testify v1.10.0 @@ -88,7 +88,7 @@ require ( golang.org/x/text v0.21.0 // indirect golang.org/x/time v0.7.0 // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect - google.golang.org/protobuf v1.36.3 // indirect + google.golang.org/protobuf v1.36.4 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/apiextensions-apiserver v0.32.0 // indirect diff --git a/instrumentor/go.sum b/instrumentor/go.sum index 4eaa7bc5bb..c4ace3bed1 100644 --- a/instrumentor/go.sum +++ b/instrumentor/go.sum @@ -141,8 +141,8 @@ github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+ github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.61.0 h1:3gv/GThfX0cV2lpO7gkTUwZru38mxevy90Bj8YFSRQQ= -github.com/prometheus/common v0.61.0/go.mod h1:zr29OCN/2BsJRaFwG8QOBr41D6kkchKbpeNH7pAjb/s= +github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io= +github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I= github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII= @@ -248,16 +248,16 @@ google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f h1: google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f/go.mod h1:Ic02D47M+zbarjYYUlK57y316f2MoN0gjAwI3f2S95o= google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f h1:OxYkA3wjPsZyBylwymxSHa7ViiW1Sml4ToBrncvFehI= google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f/go.mod h1:+2Yz8+CLJbIfL9z73EW45avw8Lmge3xVElCP9zEKi50= -google.golang.org/grpc v1.69.4 h1:MF5TftSMkd8GLw/m0KM6V8CMOCY6NZ1NQDPGFgbTt4A= -google.golang.org/grpc v1.69.4/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4= +google.golang.org/grpc v1.70.0 h1:pWFv03aZoHzlRKHWicjsZytKAiYCtNS0dHbXnIdq7jQ= +google.golang.org/grpc v1.70.0/go.mod h1:ofIJqVKDXx/JiXrwr2IG4/zwdH9txy3IlF40RmcJSQw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.36.3 h1:82DV7MYdb8anAVi3qge1wSnMDrnKK7ebr+I0hHRN1BU= -google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/protobuf v1.36.4 h1:6A3ZDJHn/eNqc1i+IdefRzy/9PokBTPvcqMySR7NNIM= +google.golang.org/protobuf v1.36.4/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/k8sutils/go.mod b/k8sutils/go.mod index 17170d8b57..15b0703fd9 100644 --- a/k8sutils/go.mod +++ b/k8sutils/go.mod @@ -46,7 +46,7 @@ require ( golang.org/x/time v0.7.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect - google.golang.org/protobuf v1.36.3 // indirect + google.golang.org/protobuf v1.36.4 // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect @@ -61,7 +61,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect golang.org/x/net v0.34.0 // indirect golang.org/x/text v0.21.0 // indirect - google.golang.org/grpc v1.69.4 + google.golang.org/grpc v1.70.0 gopkg.in/inf.v0 v0.9.1 // indirect k8s.io/cri-api v0.31.3 k8s.io/klog/v2 v2.130.1 // indirect diff --git a/k8sutils/go.sum b/k8sutils/go.sum index 8a9e218fe8..0af120df05 100644 --- a/k8sutils/go.sum +++ b/k8sutils/go.sum @@ -173,10 +173,10 @@ golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3j golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f h1:OxYkA3wjPsZyBylwymxSHa7ViiW1Sml4ToBrncvFehI= google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f/go.mod h1:+2Yz8+CLJbIfL9z73EW45avw8Lmge3xVElCP9zEKi50= -google.golang.org/grpc v1.69.4 h1:MF5TftSMkd8GLw/m0KM6V8CMOCY6NZ1NQDPGFgbTt4A= -google.golang.org/grpc v1.69.4/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4= -google.golang.org/protobuf v1.36.3 h1:82DV7MYdb8anAVi3qge1wSnMDrnKK7ebr+I0hHRN1BU= -google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/grpc v1.70.0 h1:pWFv03aZoHzlRKHWicjsZytKAiYCtNS0dHbXnIdq7jQ= +google.golang.org/grpc v1.70.0/go.mod h1:ofIJqVKDXx/JiXrwr2IG4/zwdH9txy3IlF40RmcJSQw= +google.golang.org/protobuf v1.36.4 h1:6A3ZDJHn/eNqc1i+IdefRzy/9PokBTPvcqMySR7NNIM= +google.golang.org/protobuf v1.36.4/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/odiglet/go.mod b/odiglet/go.mod index 47e2edf177..89626dd1c9 100644 --- a/odiglet/go.mod +++ b/odiglet/go.mod @@ -17,7 +17,7 @@ require ( github.com/odigos-io/opentelemetry-zap-bridge v0.0.5 github.com/odigos-io/runtime-detector v0.0.6 github.com/stretchr/testify v1.10.0 - go.opentelemetry.io/auto v0.20.0 + go.opentelemetry.io/auto v0.19.0-alpha go.opentelemetry.io/otel v1.34.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 go.uber.org/zap v1.27.0 @@ -69,9 +69,8 @@ require ( github.com/prometheus/procfs v0.15.1 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/x448/float16 v0.8.4 // indirect - github.com/xwb1989/sqlparser v0.0.0-20180606152119-120387863bf2 // indirect go.opentelemetry.io/auto/sdk v1.1.0 // indirect - go.opentelemetry.io/collector/pdata v1.24.0 // indirect + go.opentelemetry.io/collector/pdata v1.25.0 // indirect go.opentelemetry.io/contrib/bridges/prometheus v0.59.0 // indirect go.opentelemetry.io/contrib/exporters/autoexport v0.59.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.10.0 // indirect diff --git a/odiglet/go.sum b/odiglet/go.sum index fc4be8febd..d2c82c515c 100644 --- a/odiglet/go.sum +++ b/odiglet/go.sum @@ -303,19 +303,17 @@ github.com/tj/assert v0.0.3 h1:Df/BlaZ20mq6kuai7f5z2TvPFiwC3xaWJSDQNiIS3Rk= github.com/tj/assert v0.0.3/go.mod h1:Ne6X72Q+TB1AteidzQncjw9PabbMp4PBMZ1k+vd1Pvk= github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= -github.com/xwb1989/sqlparser v0.0.0-20180606152119-120387863bf2 h1:zzrxE1FKn5ryBNl9eKOeqQ58Y/Qpo3Q9QNxKHX5uzzQ= -github.com/xwb1989/sqlparser v0.0.0-20180606152119-120387863bf2/go.mod h1:hzfGeIUDq/j97IG+FhNqkowIyEcD88LrW6fyU3K3WqY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/auto v0.20.0 h1:e+um/kCMvGTMPgGRY1q3shx1iTYjYx4zKY94uwY8EZw= -go.opentelemetry.io/auto v0.20.0/go.mod h1:Gqi5YFjqbD0j+iOgn7uVfwLynYDMw5erDIeqjxfGEjE= +go.opentelemetry.io/auto v0.19.0-alpha h1:TsJVpNtI0g/N/FT/rv7jaEqctY4kJz5yPfFuol24IS8= +go.opentelemetry.io/auto v0.19.0-alpha/go.mod h1:Olz9mFDiXanGQxa4qqWYO6CV5cVFFxC5tPZzu2W3lxk= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/collector/pdata v1.24.0 h1:D6j92eAzmAbQgivNBUnt8r9juOl8ugb+ihYynoFZIEg= -go.opentelemetry.io/collector/pdata v1.24.0/go.mod h1:cf3/W9E/uIvPS4MR26SnMFJhraUCattzzM6qusuONuc= +go.opentelemetry.io/collector/pdata v1.25.0 h1:AmgBklQfbfy0lT8qsoJtRuYMZ7ZV3VZvkvhjSDentrg= +go.opentelemetry.io/collector/pdata v1.25.0/go.mod h1:Zs7D4RXOGS7E2faGc/jfWdbmhoiHBxA7QbpuJOioxq8= go.opentelemetry.io/contrib/bridges/prometheus v0.59.0 h1:HY2hJ7yn3KuEBBBsKxvF3ViSmzLwsgeNvD+0utRMgzc= go.opentelemetry.io/contrib/bridges/prometheus v0.59.0/go.mod h1:H4H7vs8766kwFnOZVEGMJFVF+phpBSmTckvvNRdJeDI= go.opentelemetry.io/contrib/exporters/autoexport v0.59.0 h1:dKhAFwh7SSoOw+gwMtSv+XLkUGTFAwAGMT3X3XSE4FA= diff --git a/opampserver/go.mod b/opampserver/go.mod index e117b4636d..f5dfe1aadd 100644 --- a/opampserver/go.mod +++ b/opampserver/go.mod @@ -8,7 +8,7 @@ require ( github.com/odigos-io/odigos/common v0.0.0 github.com/odigos-io/odigos/k8sutils v0.0.0 go.opentelemetry.io/otel v1.34.0 - google.golang.org/protobuf v1.36.3 + google.golang.org/protobuf v1.36.4 k8s.io/api v0.32.1 k8s.io/apimachinery v0.32.1 k8s.io/client-go v0.32.1 @@ -55,7 +55,7 @@ require ( github.com/pkg/errors v0.9.1 // indirect github.com/prometheus/client_golang v1.20.5 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.61.0 // indirect + github.com/prometheus/common v0.62.0 // indirect github.com/prometheus/procfs v0.15.1 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/stretchr/testify v1.10.0 diff --git a/opampserver/go.sum b/opampserver/go.sum index 463e0be9c1..bf0a3ae0b0 100644 --- a/opampserver/go.sum +++ b/opampserver/go.sum @@ -107,8 +107,8 @@ github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+ github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.61.0 h1:3gv/GThfX0cV2lpO7gkTUwZru38mxevy90Bj8YFSRQQ= -github.com/prometheus/common v0.61.0/go.mod h1:zr29OCN/2BsJRaFwG8QOBr41D6kkchKbpeNH7pAjb/s= +github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io= +github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I= github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII= @@ -190,8 +190,8 @@ golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3j golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw= gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY= -google.golang.org/protobuf v1.36.3 h1:82DV7MYdb8anAVi3qge1wSnMDrnKK7ebr+I0hHRN1BU= -google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/protobuf v1.36.4 h1:6A3ZDJHn/eNqc1i+IdefRzy/9PokBTPvcqMySR7NNIM= +google.golang.org/protobuf v1.36.4/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/scheduler/go.mod b/scheduler/go.mod index e4c4f2c59d..c68044122b 100644 --- a/scheduler/go.mod +++ b/scheduler/go.mod @@ -59,7 +59,7 @@ require ( github.com/pkg/errors v0.9.1 // indirect github.com/prometheus/client_golang v1.20.5 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.61.0 // indirect + github.com/prometheus/common v0.62.0 // indirect github.com/prometheus/procfs v0.15.1 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/x448/float16 v0.8.4 // indirect @@ -82,8 +82,8 @@ require ( gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect - google.golang.org/grpc v1.69.4 // indirect - google.golang.org/protobuf v1.36.3 // indirect + google.golang.org/grpc v1.70.0 // indirect + google.golang.org/protobuf v1.36.4 // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect diff --git a/scheduler/go.sum b/scheduler/go.sum index 2d5fc044bc..eeb741dc6d 100644 --- a/scheduler/go.sum +++ b/scheduler/go.sum @@ -143,8 +143,8 @@ github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+ github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.61.0 h1:3gv/GThfX0cV2lpO7gkTUwZru38mxevy90Bj8YFSRQQ= -github.com/prometheus/common v0.61.0/go.mod h1:zr29OCN/2BsJRaFwG8QOBr41D6kkchKbpeNH7pAjb/s= +github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io= +github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I= github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII= @@ -248,16 +248,16 @@ google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f h1: google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f/go.mod h1:Ic02D47M+zbarjYYUlK57y316f2MoN0gjAwI3f2S95o= google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f h1:OxYkA3wjPsZyBylwymxSHa7ViiW1Sml4ToBrncvFehI= google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f/go.mod h1:+2Yz8+CLJbIfL9z73EW45avw8Lmge3xVElCP9zEKi50= -google.golang.org/grpc v1.69.4 h1:MF5TftSMkd8GLw/m0KM6V8CMOCY6NZ1NQDPGFgbTt4A= -google.golang.org/grpc v1.69.4/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4= +google.golang.org/grpc v1.70.0 h1:pWFv03aZoHzlRKHWicjsZytKAiYCtNS0dHbXnIdq7jQ= +google.golang.org/grpc v1.70.0/go.mod h1:ofIJqVKDXx/JiXrwr2IG4/zwdH9txy3IlF40RmcJSQw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.36.3 h1:82DV7MYdb8anAVi3qge1wSnMDrnKK7ebr+I0hHRN1BU= -google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/protobuf v1.36.4 h1:6A3ZDJHn/eNqc1i+IdefRzy/9PokBTPvcqMySR7NNIM= +google.golang.org/protobuf v1.36.4/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/scripts/cli-docgen/go.mod b/scripts/cli-docgen/go.mod index 6336355ad4..31d82d5ea4 100644 --- a/scripts/cli-docgen/go.mod +++ b/scripts/cli-docgen/go.mod @@ -56,7 +56,7 @@ require ( golang.org/x/text v0.21.0 // indirect golang.org/x/time v0.7.0 // indirect golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect - google.golang.org/protobuf v1.36.3 // indirect + google.golang.org/protobuf v1.36.4 // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/scripts/cli-docgen/go.sum b/scripts/cli-docgen/go.sum index 31adb08391..f62340c605 100644 --- a/scripts/cli-docgen/go.sum +++ b/scripts/cli-docgen/go.sum @@ -166,8 +166,8 @@ 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= golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU= golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90= -google.golang.org/protobuf v1.36.3 h1:82DV7MYdb8anAVi3qge1wSnMDrnKK7ebr+I0hHRN1BU= -google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/protobuf v1.36.4 h1:6A3ZDJHn/eNqc1i+IdefRzy/9PokBTPvcqMySR7NNIM= +google.golang.org/protobuf v1.36.4/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= From 934dfdffa362f14817a31cba98a573a5e91a8cb9 Mon Sep 17 00:00:00 2001 From: Alon Braymok <138359965+alonkeyval@users.noreply.github.com> Date: Thu, 6 Feb 2025 10:57:44 +0200 Subject: [PATCH 03/30] [GEN-2322] chore: config set command doc (#2390) Co-authored-by: alonkeyval --- cli/cmd/config.go | 14 +++++++++++++- docs/cli/odigos_config.mdx | 12 ++++++++++++ docs/mint.json | 3 ++- docs/sync-dest-doc.py | 39 ++++++++++++++++++-------------------- 4 files changed, 45 insertions(+), 23 deletions(-) diff --git a/cli/cmd/config.go b/cli/cmd/config.go index 898f097ae3..658b80253b 100644 --- a/cli/cmd/config.go +++ b/cli/cmd/config.go @@ -17,7 +17,19 @@ import ( var configCmd = &cobra.Command{ Use: "config", Short: "Manage Odigos configuration", - Long: "Manage Odigos configuration settings to customize system behavior.", + Long: `Manage Odigos configuration settings to customize system behavior. + + Configurable properties: + - "telemetry-enabled": Enables or disables telemetry (true/false). + - "openshift-enabled": Enables or disables OpenShift support (true/false). + - "psp": Enables or disables Pod Security Policies (true/false). + - "skip-webhook-issuer-creation": Skips webhook issuer creation (true/false). + - "allow-concurrent-agents": Allows concurrent agents (true/false). + - "image-prefix": Sets the image prefix. + - "ui-mode": Sets the UI mode(normal/readonly). + - "ignored-namespaces": List of namespaces to be ignored. + - "ignored-containers": List of containers to be ignored. + `, } // `odigos config set ` diff --git a/docs/cli/odigos_config.mdx b/docs/cli/odigos_config.mdx index 8a3decedf4..d749154c4c 100644 --- a/docs/cli/odigos_config.mdx +++ b/docs/cli/odigos_config.mdx @@ -10,6 +10,18 @@ Manage Odigos configuration Manage Odigos configuration settings to customize system behavior. + Configurable properties: + - "telemetry-enabled": Enables or disables telemetry (true/false). + - "openshift-enabled": Enables or disables OpenShift support (true/false). + - "psp": Enables or disables Pod Security Policies (true/false). + - "skip-webhook-issuer-creation": Skips webhook issuer creation (true/false). + - "allow-concurrent-agents": Allows concurrent agents (true/false). + - "image-prefix": Sets the image prefix. + - "ui-mode": Sets the UI mode(normal/readonly). + - "ignored-namespaces": List of namespaces to be ignored. + - "ignored-containers": List of containers to be ignored. + + ### Options ``` diff --git a/docs/mint.json b/docs/mint.json index e2297a06ee..7d05741cad 100644 --- a/docs/mint.json +++ b/docs/mint.json @@ -87,7 +87,8 @@ "cli/odigos_uninstall", "cli/odigos_upgrade", "cli/odigos_version", - "cli/odigos_sources" + "cli/odigos_sources", + "cli/odigos_config" ] }, { diff --git a/docs/sync-dest-doc.py b/docs/sync-dest-doc.py index e8346a634a..8c396e9a41 100644 --- a/docs/sync-dest-doc.py +++ b/docs/sync-dest-doc.py @@ -18,7 +18,7 @@ def indent_lines(str="", spaces=0): str: Indented string. """ indented = "\n".join( - f"{" " * spaces}{line}" if line.strip() else line for line in str.splitlines() + f"{' ' * spaces}{line}" if line.strip() else line for line in str.splitlines() ) return indented @@ -392,12 +392,15 @@ def get_documenation(yaml_content): + "\n !! END CUSTOM EDIT !!" + "\n*/}" ) + signals_content = f"\n\n{signals}" if signals else "" + fields_content = f"\n\n{fields}" if fields else "" + note_content = f"\n\n{note}" if note else "" content_after_custom = ( f"{start_after_custom}" + "\n\n### Configuring Destination Fields" - + f"{f"\n\n{signals}" if signals else ""}" - + f"{f"\n\n{fields}" if fields else ""}" - + f"{f"\n\n{note}" if note else ""}" + + signals_content + + fields_content + + note_content + "\n\n### Adding Destination to Odigos" + "\n\nThere are two primary methods for configuring destinations in Odigos:" + "\n\n##### **Using the UI**" @@ -489,14 +492,15 @@ def create_mdx(mdx_path, yaml_content): None """ documenation = get_documenation(yaml_content) - + content_before = documenation.get("content_before_custom") + content_after = documenation.get("content_after_custom") mdx_content = ( - f"{documenation.get("content_before_custom")}" + f"{content_before}" + "\n\n**Creating Account**
" + "\nGo to the **[🔗 website](https://odigos.io) > Account** and click **Sign Up**" + "\n\n**Obtaining Access Token**
" + "\nGo to **⚙️ > Access Tokens** and click **Create New**" - + f"\n\n{documenation.get("content_after_custom")}" + + f"\n\n{content_after}" ) with open(mdx_path, 'w') as mdx_file: @@ -561,20 +565,13 @@ def process_overview(backend_yaml_dir, docs_dir): category = meta.get("category", "") signals = yaml_content.get("spec", {}).get("signals", {}) - rows.append(f"{ - generate_logo(yaml_content, True) - } | [{name}](/backends/{file.replace('.yaml', '')}) | { - "Managed" if category == "managed" else "Self-Hosted" - } | { - '✅' if signals.get("traces", {}).get( - "supported", False) else '' - } | { - '✅' if signals.get("metrics", {}).get( - "supported", False) else '' - } | { - '✅' if signals.get("logs", {}).get( - "supported", False) else '' - } |" + rows.append( + f"{generate_logo(yaml_content, True)} | " + f"[{name}](/backends/{file.replace('.yaml', '')}) | " + f"{'Managed' if category == 'managed' else 'Self-Hosted'} | " + f"{'✅' if signals.get('traces', {}).get('supported', False) else ''} | " + f"{'✅' if signals.get('metrics', {}).get('supported', False) else ''} | " + f"{'✅' if signals.get('logs', {}).get('supported', False) else ''} |" ) content = ( From f9c220128abfa2d04be078b6d987a87648f2cc56 Mon Sep 17 00:00:00 2001 From: Amir Blum Date: Thu, 6 Feb 2025 14:24:22 +0200 Subject: [PATCH 04/30] fix: add distro parameters for dotnet licbtype (#2395) When injecting dotnet agent, we need to differentiate the libc type and populate it in the relevant env var. This PR adds this into as distro parameters where we can reuse the same distro but pass in required values which are then used to set it up --- .../odigos.io_instrumentationconfigs.yaml | 8 ++++++ .../odigos/v1alpha1/containeragentconfig.go | 15 +++++++++++ .../v1alpha1/instrumentationconfig_types.go | 13 +++++++--- api/odigos/v1alpha1/zz_generated.deepcopy.go | 11 +++++++- common/libc_types.go | 2 ++ distros/distro/oteldistribution.go | 4 +++ distros/yamls/dotnet-community.yaml | 3 +++ docs/api-reference/odigos.io.v1alpha1.mdx | 12 +++++++++ .../odigos.io_instrumentationconfigs.yaml | 8 ++++++ instrumentor/controllers/agentenabled/sync.go | 26 +++++++++++++++++++ 10 files changed, 98 insertions(+), 4 deletions(-) diff --git a/api/config/crd/bases/odigos.io_instrumentationconfigs.yaml b/api/config/crd/bases/odigos.io_instrumentationconfigs.yaml index 550129cb3f..a4327066b1 100644 --- a/api/config/crd/bases/odigos.io_instrumentationconfigs.yaml +++ b/api/config/crd/bases/odigos.io_instrumentationconfigs.yaml @@ -72,12 +72,20 @@ spec: - IgnoredContainer - NoAvailableAgent - UnsupportedRuntimeVersion + - MissingDistroParameter - OtherAgentDetected type: string containerName: description: The name of the container to which this configuration applies. type: string + distroParams: + additionalProperties: + type: string + description: |- + Additional parameters to the distro that controls how it's being applied. + Keys are parameter names (like "libc") and values are the value to use for that parameter (glibc / musl) + type: object otelDistroName: description: |- The name of the otel distribution to use for this container. diff --git a/api/generated/odigos/applyconfiguration/odigos/v1alpha1/containeragentconfig.go b/api/generated/odigos/applyconfiguration/odigos/v1alpha1/containeragentconfig.go index 2acf025f4b..8434ab9525 100644 --- a/api/generated/odigos/applyconfiguration/odigos/v1alpha1/containeragentconfig.go +++ b/api/generated/odigos/applyconfiguration/odigos/v1alpha1/containeragentconfig.go @@ -29,6 +29,7 @@ type ContainerAgentConfigApplyConfiguration struct { AgentEnabledReason *odigosv1alpha1.AgentEnabledReason `json:"agentEnabledReason,omitempty"` AgentEnabledMessage *string `json:"agentEnabledMessage,omitempty"` OtelDistroName *string `json:"otelDistroName,omitempty"` + DistroParams map[string]string `json:"distroParams,omitempty"` } // ContainerAgentConfigApplyConfiguration constructs a declarative configuration of the ContainerAgentConfig type for use with @@ -76,3 +77,17 @@ func (b *ContainerAgentConfigApplyConfiguration) WithOtelDistroName(value string b.OtelDistroName = &value return b } + +// WithDistroParams puts the entries into the DistroParams field in the declarative configuration +// and returns the receiver, so that objects can be build by chaining "With" function invocations. +// If called multiple times, the entries provided by each call will be put on the DistroParams field, +// overwriting an existing map entries in DistroParams field with the same key. +func (b *ContainerAgentConfigApplyConfiguration) WithDistroParams(entries map[string]string) *ContainerAgentConfigApplyConfiguration { + if b.DistroParams == nil && len(entries) > 0 { + b.DistroParams = make(map[string]string, len(entries)) + } + for k, v := range entries { + b.DistroParams[k] = v + } + return b +} diff --git a/api/odigos/v1alpha1/instrumentationconfig_types.go b/api/odigos/v1alpha1/instrumentationconfig_types.go index 4c613019a8..cab5e075e9 100644 --- a/api/odigos/v1alpha1/instrumentationconfig_types.go +++ b/api/odigos/v1alpha1/instrumentationconfig_types.go @@ -29,7 +29,7 @@ const ( WorkloadRolloutStatusConditionType = "WorkloadRollout" ) -// +kubebuilder:validation:Enum=EnabledSuccessfully;WaitingForRuntimeInspection;WaitingForNodeCollector;UnsupportedProgrammingLanguage;IgnoredContainer;NoAvailableAgent;UnsupportedRuntimeVersion;OtherAgentDetected +// +kubebuilder:validation:Enum=EnabledSuccessfully;WaitingForRuntimeInspection;WaitingForNodeCollector;UnsupportedProgrammingLanguage;IgnoredContainer;NoAvailableAgent;UnsupportedRuntimeVersion;MissingDistroParameter;OtherAgentDetected type AgentEnabledReason string const ( @@ -40,6 +40,7 @@ const ( AgentEnabledReasonIgnoredContainer AgentEnabledReason = "IgnoredContainer" AgentEnabledReasonNoAvailableAgent AgentEnabledReason = "NoAvailableAgent" AgentEnabledReasonUnsupportedRuntimeVersion AgentEnabledReason = "UnsupportedRuntimeVersion" + AgentEnabledReasonMissingDistroParameter AgentEnabledReason = "MissingDistroParameter" AgentEnabledReasonOtherAgentDetected AgentEnabledReason = "OtherAgentDetected" ) @@ -70,10 +71,12 @@ func AgentInjectionReasonPriority(reason AgentEnabledReason) int { return 5 case AgentEnabledReasonNoAvailableAgent: return 6 - case AgentEnabledReasonOtherAgentDetected: + case AgentEnabledReasonMissingDistroParameter: return 7 - default: + case AgentEnabledReasonOtherAgentDetected: return 8 + default: + return 9 } } @@ -152,6 +155,10 @@ type ContainerAgentConfig struct { // The name of the otel distribution to use for this container. // if the name is empty, this container should not be instrumented. OtelDistroName string `json:"otelDistroName,omitempty"` + + // Additional parameters to the distro that controls how it's being applied. + // Keys are parameter names (like "libc") and values are the value to use for that parameter (glibc / musl) + DistroParams map[string]string `json:"distroParams,omitempty"` } // Config for the OpenTelemeetry SDKs that should be applied to a workload. diff --git a/api/odigos/v1alpha1/zz_generated.deepcopy.go b/api/odigos/v1alpha1/zz_generated.deepcopy.go index a537ced10a..8e9170f453 100644 --- a/api/odigos/v1alpha1/zz_generated.deepcopy.go +++ b/api/odigos/v1alpha1/zz_generated.deepcopy.go @@ -239,6 +239,13 @@ func (in *ConfigOption) DeepCopy() *ConfigOption { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ContainerAgentConfig) DeepCopyInto(out *ContainerAgentConfig) { *out = *in + if in.DistroParams != nil { + in, out := &in.DistroParams, &out.DistroParams + *out = make(map[string]string, len(*in)) + for key, val := range *in { + (*out)[key] = val + } + } } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ContainerAgentConfig. @@ -471,7 +478,9 @@ func (in *InstrumentationConfigSpec) DeepCopyInto(out *InstrumentationConfigSpec if in.Containers != nil { in, out := &in.Containers, &out.Containers *out = make([]ContainerAgentConfig, len(*in)) - copy(*out, *in) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } } if in.SdkConfigs != nil { in, out := &in.SdkConfigs, &out.SdkConfigs diff --git a/common/libc_types.go b/common/libc_types.go index a8896f945b..cf0d5788a4 100644 --- a/common/libc_types.go +++ b/common/libc_types.go @@ -7,3 +7,5 @@ const ( Glibc LibCType = "glibc" Musl LibCType = "musl" ) + +const LibcTypeDistroParameterName = "LIBC_TYPE" diff --git a/distros/distro/oteldistribution.go b/distros/distro/oteldistribution.go index 3620a859e5..de847d633e 100644 --- a/distros/distro/oteldistribution.go +++ b/distros/distro/oteldistribution.go @@ -57,6 +57,10 @@ type OtelDistro struct { // each distribution must target a single language. Language common.ProgrammingLanguage `yaml:"language"` + // List of distribution parameters that are required to be set by the user. + // for example: libc type. + RequireParameters []string `yaml:"requireParameters,omitempty"` + // the runtime environments this distribution targets. // examples: nodejs, JVM, CPython, etc. // while java-script can run in both nodejs and browser, the distribution should specify where it is intended to run. diff --git a/distros/yamls/dotnet-community.yaml b/distros/yamls/dotnet-community.yaml index 573194f740..27489e2b9a 100644 --- a/distros/yamls/dotnet-community.yaml +++ b/distros/yamls/dotnet-community.yaml @@ -5,6 +5,8 @@ metadata: spec: name: dotnet-community language: dotnet + requireParameters: + - LIBC_TYPE runtimeEnvironments: - name: dotnet-version supportedVersions: '>= 6.0' @@ -16,3 +18,4 @@ spec: This distribution is for Dotnet applications using OpenTelemetry Native SDK and instrumentation libraries from the OpenTelemetry community. tiers: - community + - onprem diff --git a/docs/api-reference/odigos.io.v1alpha1.mdx b/docs/api-reference/odigos.io.v1alpha1.mdx index 235632c927..d82b1e526d 100644 --- a/docs/api-reference/odigos.io.v1alpha1.mdx +++ b/docs/api-reference/odigos.io.v1alpha1.mdx @@ -1039,6 +1039,18 @@ can be left empty if reason is self-explanatory.

if the name is empty, this container should not be instrumented.

+ + +distroParams [Required] + + +map[string]string + + +

Additional parameters to the distro that controls how it's being applied. +Keys are parameter names (like "libc") and values are the value to use for that parameter (glibc / musl)

+ + diff --git a/helm/odigos/templates/crds/odigos.io_instrumentationconfigs.yaml b/helm/odigos/templates/crds/odigos.io_instrumentationconfigs.yaml index 550129cb3f..a4327066b1 100644 --- a/helm/odigos/templates/crds/odigos.io_instrumentationconfigs.yaml +++ b/helm/odigos/templates/crds/odigos.io_instrumentationconfigs.yaml @@ -72,12 +72,20 @@ spec: - IgnoredContainer - NoAvailableAgent - UnsupportedRuntimeVersion + - MissingDistroParameter - OtherAgentDetected type: string containerName: description: The name of the container to which this configuration applies. type: string + distroParams: + additionalProperties: + type: string + description: |- + Additional parameters to the distro that controls how it's being applied. + Keys are parameter names (like "libc") and values are the value to use for that parameter (glibc / musl) + type: object otelDistroName: description: |- The name of the otel distribution to use for this container. diff --git a/instrumentor/controllers/agentenabled/sync.go b/instrumentor/controllers/agentenabled/sync.go index c6e2ef806c..7a90121abc 100644 --- a/instrumentor/controllers/agentenabled/sync.go +++ b/instrumentor/controllers/agentenabled/sync.go @@ -286,6 +286,30 @@ func containerInstrumentationConfig(containerName string, } } + distroParameters := map[string]string{} + for _, parameterName := range distro.RequireParameters { + switch parameterName { + case common.LibcTypeDistroParameterName: + if runtimeDetails.LibCType == nil { + return odigosv1.ContainerAgentConfig{ + ContainerName: containerName, + AgentEnabled: false, + AgentEnabledReason: odigosv1.AgentEnabledReasonMissingDistroParameter, + AgentEnabledMessage: fmt.Sprintf("missing required parameter '%s' for distro '%s'", common.LibcTypeDistroParameterName, distroName), + } + } + distroParameters[common.LibcTypeDistroParameterName] = string(*runtimeDetails.LibCType) + + default: + return odigosv1.ContainerAgentConfig{ + ContainerName: containerName, + AgentEnabled: false, + AgentEnabledReason: odigosv1.AgentEnabledReasonMissingDistroParameter, + AgentEnabledMessage: fmt.Sprintf("unsupported parameter '%s' for distro '%s'", parameterName, distroName), + } + } + } + // check for presence of other agents if runtimeDetails.OtherAgent != nil { if effectiveConfig.AllowConcurrentAgents == nil || !*effectiveConfig.AllowConcurrentAgents { @@ -302,6 +326,7 @@ func containerInstrumentationConfig(containerName string, AgentEnabledReason: odigosv1.AgentEnabledReasonEnabledSuccessfully, AgentEnabledMessage: fmt.Sprintf("we are operating alongside the %s, which is not the recommended configuration. We suggest disabling the %s for optimal performance.", runtimeDetails.OtherAgent.Name, runtimeDetails.OtherAgent.Name), OtelDistroName: distroName, + DistroParams: distroParameters, } } } @@ -310,6 +335,7 @@ func containerInstrumentationConfig(containerName string, ContainerName: containerName, AgentEnabled: true, OtelDistroName: distroName, + DistroParams: distroParameters, } return containerConfig From 29b06d7023a34b3c85e13b29a685c887bfb794db Mon Sep 17 00:00:00 2001 From: Avihu Hanya <34632558+AvihuHenya@users.noreply.github.com> Date: Thu, 6 Feb 2025 15:27:45 +0200 Subject: [PATCH 05/30] reduce fp nodejs runtime inspection (#2383) Co-authored-by: Eden Federman --- procdiscovery/pkg/inspectors/nodejs/nodejs.go | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/procdiscovery/pkg/inspectors/nodejs/nodejs.go b/procdiscovery/pkg/inspectors/nodejs/nodejs.go index 49fc8c1e78..09a615e5a0 100644 --- a/procdiscovery/pkg/inspectors/nodejs/nodejs.go +++ b/procdiscovery/pkg/inspectors/nodejs/nodejs.go @@ -1,7 +1,8 @@ package nodejs import ( - "strings" + "path/filepath" + "regexp" "github.com/hashicorp/go-version" @@ -11,10 +12,15 @@ import ( type NodejsInspector struct{} -const nodeProcessName = "node" +var v8Regex = regexp.MustCompile(`^(?:.*/)?node(\d+)?$`) + +var nodeExecutables = map[string]bool{ + "npm": true, + "yarn": true, +} func (n *NodejsInspector) Inspect(proc *process.Details) (common.ProgrammingLanguage, bool) { - if strings.Contains(proc.ExePath, nodeProcessName) || strings.Contains(proc.CmdLine, nodeProcessName) { + if v8Regex.MatchString(filepath.Base(proc.ExePath)) || nodeExecutables[filepath.Base(proc.ExePath)] { return common.JavascriptProgrammingLanguage, true } From fbfa7918f0c37adc4a4a7ed28defcb1ca92013c7 Mon Sep 17 00:00:00 2001 From: Amir Blum Date: Thu, 6 Feb 2025 15:28:47 +0200 Subject: [PATCH 06/30] feat: instrumentation rule for otel distros (#2396) This is to move away from the Deprecated `OtelSdk` and towards using the more generic OtelDistribution --------- Co-authored-by: Ron Federman <73110295+RonFed@users.noreply.github.com> --- .../bases/odigos.io_instrumentationrules.yaml | 20 +++++++++++++++---- .../v1alpha1/instrumentationrulespec.go | 9 +++++++++ .../v1alpha1/instrumentationrule_type.go | 7 ++++--- .../v1alpha1/instrumentationrules/otel-sdk.go | 12 +++++++++++ .../zz_generated.deepcopy.go | 20 +++++++++++++++++++ api/odigos/v1alpha1/zz_generated.deepcopy.go | 5 +++++ docs/api-reference/odigos.io.v1alpha1.mdx | 15 +++++++++++--- .../crds/odigos.io_instrumentationrules.yaml | 20 +++++++++++++++---- instrumentor/controllers/agentenabled/sync.go | 19 +++++++++++++++--- .../manifests/java-ebpf-instrumentations.yaml | 3 +++ .../legacy-dotnet-instrumentation.yaml | 3 +++ 11 files changed, 116 insertions(+), 17 deletions(-) diff --git a/api/config/crd/bases/odigos.io_instrumentationrules.yaml b/api/config/crd/bases/odigos.io_instrumentationrules.yaml index 07cd154ed1..d835f060ad 100644 --- a/api/config/crd/bases/odigos.io_instrumentationrules.yaml +++ b/api/config/crd/bases/odigos.io_instrumentationrules.yaml @@ -128,11 +128,23 @@ spec: regarding the rule for convenience. For example: why it was added. Odigos does not use or assume any meaning from this field.' type: string + otelDistros: + description: Set the otel distros to use instead of the defaults. + properties: + otelDistroNames: + description: |- + Set a list of distribution names that take priority over the default distributions. + if a language is not in this list, the default distribution will be used. + it multiple distributions are specified for the same language, in one or many rules, + the behavior is undefined. + items: + type: string + type: array + required: + - otelDistroNames + type: object otelSdks: - description: |- - Set the OtelSdk to use for the workloads in this rule. - instrumentation libraries will be ignored if set. - the rule will be used only for languages which are specified, and ignored otherwise. + description: 'Deprecated: use OrelDistros instead.' properties: otelSdkByLanguage: additionalProperties: diff --git a/api/generated/odigos/applyconfiguration/odigos/v1alpha1/instrumentationrulespec.go b/api/generated/odigos/applyconfiguration/odigos/v1alpha1/instrumentationrulespec.go index 46be580440..25a4b68db3 100644 --- a/api/generated/odigos/applyconfiguration/odigos/v1alpha1/instrumentationrulespec.go +++ b/api/generated/odigos/applyconfiguration/odigos/v1alpha1/instrumentationrulespec.go @@ -32,6 +32,7 @@ type InstrumentationRuleSpecApplyConfiguration struct { InstrumentationLibraries *[]InstrumentationLibraryGlobalIdApplyConfiguration `json:"instrumentationLibraries,omitempty"` PayloadCollection *instrumentationrules.PayloadCollection `json:"payloadCollection,omitempty"` OtelSdks *instrumentationrules.OtelSdks `json:"otelSdks,omitempty"` + OtelDistros *instrumentationrules.OtelDistros `json:"otelDistros,omitempty"` CodeAttributes *instrumentationrules.CodeAttributes `json:"codeAttributes,omitempty"` } @@ -109,6 +110,14 @@ func (b *InstrumentationRuleSpecApplyConfiguration) WithOtelSdks(value instrumen return b } +// WithOtelDistros sets the OtelDistros field in the declarative configuration to the given value +// and returns the receiver, so that objects can be built by chaining "With" function invocations. +// If called multiple times, the OtelDistros field is set to the value of the last call. +func (b *InstrumentationRuleSpecApplyConfiguration) WithOtelDistros(value instrumentationrules.OtelDistros) *InstrumentationRuleSpecApplyConfiguration { + b.OtelDistros = &value + return b +} + // WithCodeAttributes sets the CodeAttributes field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the CodeAttributes field is set to the value of the last call. diff --git a/api/odigos/v1alpha1/instrumentationrule_type.go b/api/odigos/v1alpha1/instrumentationrule_type.go index 52d3180658..83e195b051 100644 --- a/api/odigos/v1alpha1/instrumentationrule_type.go +++ b/api/odigos/v1alpha1/instrumentationrule_type.go @@ -61,11 +61,12 @@ type InstrumentationRuleSpec struct { // Allows to configure payload collection aspects for different types of payloads. PayloadCollection *instrumentationrules.PayloadCollection `json:"payloadCollection,omitempty"` - // Set the OtelSdk to use for the workloads in this rule. - // instrumentation libraries will be ignored if set. - // the rule will be used only for languages which are specified, and ignored otherwise. + // Deprecated: use OrelDistros instead. OtelSdks *instrumentationrules.OtelSdks `json:"otelSdks,omitempty"` + // Set the otel distros to use instead of the defaults. + OtelDistros *instrumentationrules.OtelDistros `json:"otelDistros,omitempty"` + // Configure which code attributes should be recorded as span attributes. CodeAttributes *instrumentationrules.CodeAttributes `json:"codeAttributes,omitempty"` } diff --git a/api/odigos/v1alpha1/instrumentationrules/otel-sdk.go b/api/odigos/v1alpha1/instrumentationrules/otel-sdk.go index e70843b52b..5ed92b784a 100644 --- a/api/odigos/v1alpha1/instrumentationrules/otel-sdk.go +++ b/api/odigos/v1alpha1/instrumentationrules/otel-sdk.go @@ -4,6 +4,18 @@ import "github.com/odigos-io/odigos/common" // +kubebuilder:object:generate=true // +kubebuilder:deepcopy-gen=true +// Deprecated: Use OtelDistro instead type OtelSdks struct { OtelSdkByLanguage map[common.ProgrammingLanguage]common.OtelSdk `json:"otelSdkByLanguage"` } + +// +kubebuilder:object:generate=true +// +kubebuilder:deepcopy-gen=true +type OtelDistros struct { + + // Set a list of distribution names that take priority over the default distributions. + // if a language is not in this list, the default distribution will be used. + // it multiple distributions are specified for the same language, in one or many rules, + // the behavior is undefined. + OtelDistroNames []string `json:"otelDistroNames"` +} diff --git a/api/odigos/v1alpha1/instrumentationrules/zz_generated.deepcopy.go b/api/odigos/v1alpha1/instrumentationrules/zz_generated.deepcopy.go index a8f5f31d85..9a2de78f09 100644 --- a/api/odigos/v1alpha1/instrumentationrules/zz_generated.deepcopy.go +++ b/api/odigos/v1alpha1/instrumentationrules/zz_generated.deepcopy.go @@ -153,6 +153,26 @@ func (in *MessagingPayloadCollection) DeepCopy() *MessagingPayloadCollection { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *OtelDistros) DeepCopyInto(out *OtelDistros) { + *out = *in + if in.OtelDistroNames != nil { + in, out := &in.OtelDistroNames, &out.OtelDistroNames + *out = make([]string, len(*in)) + copy(*out, *in) + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new OtelDistros. +func (in *OtelDistros) DeepCopy() *OtelDistros { + if in == nil { + return nil + } + out := new(OtelDistros) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *OtelSdks) DeepCopyInto(out *OtelSdks) { *out = *in diff --git a/api/odigos/v1alpha1/zz_generated.deepcopy.go b/api/odigos/v1alpha1/zz_generated.deepcopy.go index 8e9170f453..91f4aba40d 100644 --- a/api/odigos/v1alpha1/zz_generated.deepcopy.go +++ b/api/odigos/v1alpha1/zz_generated.deepcopy.go @@ -864,6 +864,11 @@ func (in *InstrumentationRuleSpec) DeepCopyInto(out *InstrumentationRuleSpec) { *out = new(instrumentationrules.OtelSdks) (*in).DeepCopyInto(*out) } + if in.OtelDistros != nil { + in, out := &in.OtelDistros, &out.OtelDistros + *out = new(instrumentationrules.OtelDistros) + (*in).DeepCopyInto(*out) + } if in.CodeAttributes != nil { in, out := &in.CodeAttributes, &out.CodeAttributes *out = new(instrumentationrules.CodeAttributes) diff --git a/docs/api-reference/odigos.io.v1alpha1.mdx b/docs/api-reference/odigos.io.v1alpha1.mdx index d82b1e526d..f859666751 100644 --- a/docs/api-reference/odigos.io.v1alpha1.mdx +++ b/docs/api-reference/odigos.io.v1alpha1.mdx @@ -1869,9 +1869,18 @@ If empty, no instrumentation libraries will be used.

instrumentationrules.OtelSdks -

Set the OtelSdk to use for the workloads in this rule. -instrumentation libraries will be ignored if set. -the rule will be used only for languages which are specified, and ignored otherwise.

+

Deprecated: use OrelDistros instead.

+ + + + +otelDistros [Required] + + +instrumentationrules.OtelDistros + + +

Set the otel distros to use instead of the defaults.

diff --git a/helm/odigos/templates/crds/odigos.io_instrumentationrules.yaml b/helm/odigos/templates/crds/odigos.io_instrumentationrules.yaml index 07cd154ed1..d835f060ad 100644 --- a/helm/odigos/templates/crds/odigos.io_instrumentationrules.yaml +++ b/helm/odigos/templates/crds/odigos.io_instrumentationrules.yaml @@ -128,11 +128,23 @@ spec: regarding the rule for convenience. For example: why it was added. Odigos does not use or assume any meaning from this field.' type: string + otelDistros: + description: Set the otel distros to use instead of the defaults. + properties: + otelDistroNames: + description: |- + Set a list of distribution names that take priority over the default distributions. + if a language is not in this list, the default distribution will be used. + it multiple distributions are specified for the same language, in one or many rules, + the behavior is undefined. + items: + type: string + type: array + required: + - otelDistroNames + type: object otelSdks: - description: |- - Set the OtelSdk to use for the workloads in this rule. - instrumentation libraries will be ignored if set. - the rule will be used only for languages which are specified, and ignored otherwise. + description: 'Deprecated: use OrelDistros instead.' properties: otelSdkByLanguage: additionalProperties: diff --git a/instrumentor/controllers/agentenabled/sync.go b/instrumentor/controllers/agentenabled/sync.go index 7a90121abc..e3c844db4c 100644 --- a/instrumentor/controllers/agentenabled/sync.go +++ b/instrumentor/controllers/agentenabled/sync.go @@ -344,14 +344,27 @@ func containerInstrumentationConfig(containerName string, func applyRulesForDistros(defaultDistros map[common.ProgrammingLanguage]string, instrumentationRules *[]odigosv1.InstrumentationRule) map[common.ProgrammingLanguage]string { + distrosPerLanguage := make(map[common.ProgrammingLanguage]string, len(defaultDistros)) + for lang, distroName := range defaultDistros { + distrosPerLanguage[lang] = distroName + } + for _, rule := range *instrumentationRules { - if rule.Spec.OtelSdks == nil { + if rule.Spec.OtelDistros == nil { continue } - // TODO: change this from otel sdks to distros and use distro name + for _, distroName := range rule.Spec.OtelDistros.OtelDistroNames { + distro := distros.GetDistroByName(distroName) + if distro == nil { + continue + } + + lang := distro.Language + distrosPerLanguage[lang] = distroName + } } - return defaultDistros + return distrosPerLanguage } // This function checks if we are waiting for some transient prerequisites to be completed before injecting the agent. diff --git a/profiles/manifests/java-ebpf-instrumentations.yaml b/profiles/manifests/java-ebpf-instrumentations.yaml index 0d1abf096c..80a7668cb3 100644 --- a/profiles/manifests/java-ebpf-instrumentations.yaml +++ b/profiles/manifests/java-ebpf-instrumentations.yaml @@ -10,3 +10,6 @@ spec: java: sdkTier: "enterprise" sdkType: "ebpf" + otelDistros: + otelDistroNames: + - "java-ebpf-instrumentations" diff --git a/profiles/manifests/legacy-dotnet-instrumentation.yaml b/profiles/manifests/legacy-dotnet-instrumentation.yaml index bf1bd3e5bd..4e09b07a11 100644 --- a/profiles/manifests/legacy-dotnet-instrumentation.yaml +++ b/profiles/manifests/legacy-dotnet-instrumentation.yaml @@ -10,3 +10,6 @@ spec: dotnet: sdkTier: "enterprise" sdkType: "native" + otelDistros: + otelDistroNames: + - "dotnet-legacy" From 741e957833862ddfd0f8b578e8114f6269058ddf Mon Sep 17 00:00:00 2001 From: Tamir David Date: Thu, 6 Feb 2025 18:38:55 +0200 Subject: [PATCH 07/30] chore: bump-python agent version (#2397) --- agents/python/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/python/setup.py b/agents/python/setup.py index 5b912908ad..c74e119b10 100644 --- a/agents/python/setup.py +++ b/agents/python/setup.py @@ -6,7 +6,7 @@ # index_url = 'http://host.docker.internal:8081/packages/odigos_opentelemetry_python-0.1.1-py3-none-any.whl' install_requires = [ - f"odigos-opentelemetry-python @ {index_url}" if index_url else "odigos-opentelemetry-python==1.0.25" + f"odigos-opentelemetry-python @ {index_url}" if index_url else "odigos-opentelemetry-python==1.0.26" ] setup( From 11428367141ab3f3b78ea9e09dfdb51920c3441b Mon Sep 17 00:00:00 2001 From: Amir Blum Date: Thu, 6 Feb 2025 21:12:12 +0200 Subject: [PATCH 08/30] feat: mount odigos agent directory via pod manifest (#2398) This is preparation for removing the instrumentation device which currently is responsible for the mount --- api/k8sconsts/agent.go | 6 ++ .../v1alpha1/instrumentationconfig_types.go | 9 +++ cli/cmd/resources/odiglet.go | 6 +- distros/distro/oteldistribution.go | 14 ++++ distros/yamls/dotnet-community.yaml | 2 + distros/yamls/dotnet-legacy.yaml | 2 + distros/yamls/java-community.yaml | 3 +- distros/yamls/java-ebpf-instrumentations.yaml | 2 + distros/yamls/java-enterprise.yaml | 2 + distros/yamls/nodejs-community.yaml | 2 + distros/yamls/nodejs-enterprise.yaml | 2 + distros/yamls/python-community.yaml | 2 + distros/yamls/python-enterprise.yaml | 3 +- .../controllers/agentenabled/pods_webhook.go | 72 ++++++++++++++++++- .../runtimemigration/runtimemigration.go | 6 +- k8sutils/pkg/cri/criwrapper.go | 3 +- odiglet/pkg/instrumentation/fs/agents.go | 10 +-- 17 files changed, 129 insertions(+), 17 deletions(-) create mode 100644 api/k8sconsts/agent.go diff --git a/api/k8sconsts/agent.go b/api/k8sconsts/agent.go new file mode 100644 index 0000000000..8aadfc001c --- /dev/null +++ b/api/k8sconsts/agent.go @@ -0,0 +1,6 @@ +package k8sconsts + +const ( + OdigosAgentsDirectory = "/var/odigos" + OdigosAgentMountVolumeName = "odigos-agent" +) diff --git a/api/odigos/v1alpha1/instrumentationconfig_types.go b/api/odigos/v1alpha1/instrumentationconfig_types.go index cab5e075e9..ee1d15bd82 100644 --- a/api/odigos/v1alpha1/instrumentationconfig_types.go +++ b/api/odigos/v1alpha1/instrumentationconfig_types.go @@ -179,6 +179,15 @@ type InstrumentationConfigSpec struct { SdkConfigs []SdkConfig `json:"sdkConfigs,omitempty"` } +func (in *InstrumentationConfigSpec) GetContainerAgentConfig(containerName string) *ContainerAgentConfig { + for _, containerConfig := range in.Containers { + if containerConfig.ContainerName == containerName { + return &containerConfig + } + } + return nil +} + type SdkConfig struct { // The language of the SDK being configured diff --git a/cli/cmd/resources/odiglet.go b/cli/cmd/resources/odiglet.go index 8a5a58388e..b3f8a69751 100644 --- a/cli/cmd/resources/odiglet.go +++ b/cli/cmd/resources/odiglet.go @@ -360,7 +360,7 @@ func NewOdigletDaemonSet(ns string, version string, imagePrefix string, imageNam Name: "odigos", VolumeSource: corev1.VolumeSource{ HostPath: &corev1.HostPathVolumeSource{ - Path: "/var/odigos", + Path: k8sconsts.OdigosAgentsDirectory, }, }, }, @@ -408,7 +408,7 @@ func NewOdigletDaemonSet(ns string, version string, imagePrefix string, imageNam VolumeMounts: append([]corev1.VolumeMount{ { Name: "odigos", - MountPath: "/var/odigos", + MountPath: k8sconsts.OdigosAgentsDirectory, }, }, odigosSeLinuxHostVolumeMounts...), ImagePullPolicy: "IfNotPresent", @@ -477,7 +477,7 @@ func NewOdigletDaemonSet(ns string, version string, imagePrefix string, imageNam }, { Name: "odigos", - MountPath: "/var/odigos", + MountPath: k8sconsts.OdigosAgentsDirectory, ReadOnly: true, }, { diff --git a/distros/distro/oteldistribution.go b/distros/distro/oteldistribution.go index de847d633e..9186b7a80a 100644 --- a/distros/distro/oteldistribution.go +++ b/distros/distro/oteldistribution.go @@ -2,6 +2,8 @@ package distro import "github.com/odigos-io/odigos/common" +const AgentPlaceholderDirectory = "{{ODIGOS_AGENTS_DIR}}" + type RuntimeEnvironment struct { // the runtime environment this distribution targets. // examples: nodejs, JVM, CPython, etc. @@ -38,6 +40,13 @@ type EnvironmentVariable struct { Delimiter string `yaml:"delimiter"` } +type AgentDirectory struct { + // The name of a directory where odigos agent files can be found. + // The special value {{ODIGOS_AGENTS_DIR}} is replaced with the actual value at this platform. + // K8s will mount this directory from the node fs to the container, but other platforms may have different ways for handling this. + DirectoryName string `yaml:"directoryName"` +} + // OtelDistro (Short for OpenTelemetry Distribution) is a collection of OpenTelemetry components, // including instrumentations, SDKs, and other components that are distributed together. // Each distribution includes a unique name, and metadata about the ways it is implemented. @@ -78,4 +87,9 @@ type OtelDistro struct { // a list of environment variables that needs to be set in the application runtime // to enable the distribution. EnvironmentVariables []EnvironmentVariable `yaml:"environmentVariables,omitempty"` + + // Directories on the FS where the agent files can be consumed from. + // this can be empty if the distribution does not require agent files, + // or contain more than one directory if the distribution requires it. + AgentDirectories []AgentDirectory `yaml:"agentDirectories,omitempty"` } diff --git a/distros/yamls/dotnet-community.yaml b/distros/yamls/dotnet-community.yaml index 27489e2b9a..0e43fe486f 100644 --- a/distros/yamls/dotnet-community.yaml +++ b/distros/yamls/dotnet-community.yaml @@ -19,3 +19,5 @@ spec: tiers: - community - onprem + agentDirectories: + - directoryName: "{{ODIGOS_AGENTS_DIR}}/dotnet" diff --git a/distros/yamls/dotnet-legacy.yaml b/distros/yamls/dotnet-legacy.yaml index 554a55627c..561aafa052 100644 --- a/distros/yamls/dotnet-legacy.yaml +++ b/distros/yamls/dotnet-legacy.yaml @@ -13,3 +13,5 @@ spec: This distribution is for Dotnet applications running on old runtimes, using OpenTelemetry Native SDK and instrumentation libraries from the OpenTelemetry community. tiers: - onprem + agentDirectories: + - directoryName: "{{ODIGOS_AGENTS_DIR}}/legacy-dotnet" diff --git a/distros/yamls/java-community.yaml b/distros/yamls/java-community.yaml index b108a73820..8ae6392005 100644 --- a/distros/yamls/java-community.yaml +++ b/distros/yamls/java-community.yaml @@ -20,4 +20,5 @@ spec: - envName: JAVA_TOOL_OPTIONS envValue: '-javaagent:{{ODIGOS_AGENTS_DIR}}/java/javaagent.jar' delimiter: ' ' - + agentDirectories: + - directoryName: "{{ODIGOS_AGENTS_DIR}}/java" diff --git a/distros/yamls/java-ebpf-instrumentations.yaml b/distros/yamls/java-ebpf-instrumentations.yaml index c405a936e7..eb4bef7783 100644 --- a/distros/yamls/java-ebpf-instrumentations.yaml +++ b/distros/yamls/java-ebpf-instrumentations.yaml @@ -20,3 +20,5 @@ spec: - envName: JAVA_TOOL_OPTIONS envValue: '-javaagent:{{ODIGOS_AGENTS_DIR}}/java-ebpf/dtrace-injector.jar' delimiter: ' ' + agentDirectories: + - directoryName: "{{ODIGOS_AGENTS_DIR}}/java-ebpf" diff --git a/distros/yamls/java-enterprise.yaml b/distros/yamls/java-enterprise.yaml index 1c9a9c7a8c..59de21986a 100644 --- a/distros/yamls/java-enterprise.yaml +++ b/distros/yamls/java-enterprise.yaml @@ -20,3 +20,5 @@ spec: - envName: JAVA_TOOL_OPTIONS envValue: "-javaagent:{{ODIGOS_AGENTS_DIR}}/java-ext-ebpf/javaagent.jar -Dotel.javaagent.extensions={{ODIGOS_AGENTS_DIR}}/java-ext-ebpf/otel_agent_extension.jar" delimiter: ' ' + agentDirectories: + - directoryName: "{{ODIGOS_AGENTS_DIR}}/java-ext-ebpf" diff --git a/distros/yamls/nodejs-community.yaml b/distros/yamls/nodejs-community.yaml index 94bed49104..60f26cb5fc 100644 --- a/distros/yamls/nodejs-community.yaml +++ b/distros/yamls/nodejs-community.yaml @@ -17,3 +17,5 @@ spec: - envName: NODE_OPTIONS envValue: '--require {{ODIGOS_AGENTS_DIR}}/nodejs/autoinstrumentation.js' delimiter: ' ' + agentDirectories: + - directoryName: "{{ODIGOS_AGENTS_DIR}}/nodejs" diff --git a/distros/yamls/nodejs-enterprise.yaml b/distros/yamls/nodejs-enterprise.yaml index cb860e1de6..e5d474088f 100644 --- a/distros/yamls/nodejs-enterprise.yaml +++ b/distros/yamls/nodejs-enterprise.yaml @@ -17,3 +17,5 @@ spec: - envName: NODE_OPTIONS envValue: '--require {{ODIGOS_AGENTS_DIR}}/nodejs-ebpf/autoinstrumentation.js' delimiter: ' ' + agentDirectories: + - directoryName: "{{ODIGOS_AGENTS_DIR}}/nodejs-ebpf" diff --git a/distros/yamls/python-community.yaml b/distros/yamls/python-community.yaml index 7c14aa9c9d..ac96da44dc 100644 --- a/distros/yamls/python-community.yaml +++ b/distros/yamls/python-community.yaml @@ -17,3 +17,5 @@ spec: - envName: PYTHONPATH envValue: '{{ODIGOS_AGENTS_DIR}}/python:{{ODIGOS_AGENTS_DIR}}/python/opentelemetry/instrumentation/auto_instrumentation' delimiter: ':' + agentDirectories: + - directoryName: "{{ODIGOS_AGENTS_DIR}}/python" diff --git a/distros/yamls/python-enterprise.yaml b/distros/yamls/python-enterprise.yaml index 877e7290e3..11b5749cd9 100644 --- a/distros/yamls/python-enterprise.yaml +++ b/distros/yamls/python-enterprise.yaml @@ -17,4 +17,5 @@ spec: - envName: PYTHONPATH envValue: '{{ODIGOS_AGENTS_DIR}}/python-ebpf:{{ODIGOS_AGENTS_DIR}}/python/opentelemetry/instrumentation/auto_instrumentation:{{ODIGOS_AGENTS_DIR}}/python' delimiter: ':' - + agentDirectories: + - directoryName: "{{ODIGOS_AGENTS_DIR}}/python-ebpf" diff --git a/instrumentor/controllers/agentenabled/pods_webhook.go b/instrumentor/controllers/agentenabled/pods_webhook.go index 33f2d80fb3..b2a08cec5c 100644 --- a/instrumentor/controllers/agentenabled/pods_webhook.go +++ b/instrumentor/controllers/agentenabled/pods_webhook.go @@ -10,6 +10,8 @@ import ( "github.com/odigos-io/odigos/api/k8sconsts" odigosv1 "github.com/odigos-io/odigos/api/odigos/v1alpha1" "github.com/odigos-io/odigos/common" + "github.com/odigos-io/odigos/distros" + "github.com/odigos-io/odigos/distros/distro" "github.com/odigos-io/odigos/instrumentor/controllers/utils" podutils "github.com/odigos-io/odigos/instrumentor/internal/pod" webhookdeviceinjector "github.com/odigos-io/odigos/instrumentor/internal/webhook_device_injector" @@ -78,6 +80,31 @@ func (p *PodsWebhook) Default(ctx context.Context, obj runtime.Object) error { return nil } + // Add odiglet installed node-affinity to the pod + podutils.AddOdigletInstalledAffinity(pod) + + volumeMounted := false + for i := range pod.Spec.Containers { + podContainerSpec := &pod.Spec.Containers[i] + containerConfig := ic.Spec.GetContainerAgentConfig(podContainerSpec.Name) + if containerConfig == nil { + // no config is found for this container, so skip (don't inject anything to it) + continue + } + + containerVolumeMounted, err := injectOdigosToContainer(containerConfig, podContainerSpec) + if err != nil { + logger.Error(err, "failed to inject ODIGOS agent to container") + continue + } + volumeMounted = volumeMounted || containerVolumeMounted + } + + if volumeMounted { + // only mount the volume if at least one container has a volume to mount + mountPodVolume(pod) + } + // Inject ODIGOS environment variables and instrumentation device into all containers injectErr := p.injectOdigosInstrumentation(ctx, pod, &ic, pw) if injectErr != nil { @@ -85,9 +112,6 @@ func (p *PodsWebhook) Default(ctx context.Context, obj runtime.Object) error { return nil } - // Add odiglet installed node-affinity to the pod - podutils.AddOdigletInstalledAffinity(pod) - return nil } @@ -191,6 +215,48 @@ func (p *PodsWebhook) injectOdigosInstrumentation(ctx context.Context, pod *core return nil } +func mountDirectory(containerSpec *corev1.Container, dir string) { + // TODO: assuming the directory always starts with {{ODIGOS_AGENTS_DIR}}. This should be validated. + // Should we return errors here to validate static values? + relativePath := strings.TrimPrefix(dir, distro.AgentPlaceholderDirectory+"/") + absolutePath := strings.ReplaceAll(dir, distro.AgentPlaceholderDirectory, k8sconsts.OdigosAgentsDirectory) + containerSpec.VolumeMounts = append(containerSpec.VolumeMounts, corev1.VolumeMount{ + Name: k8sconsts.OdigosAgentMountVolumeName, + SubPath: relativePath, + MountPath: absolutePath, + ReadOnly: true, + }) +} + +func injectOdigosToContainer(containerConfig *odigosv1.ContainerAgentConfig, podContainerSpec *corev1.Container) (bool, error) { + + distroName := containerConfig.OtelDistroName + + distroMetadata := distros.GetDistroByName(distroName) + if distroMetadata == nil { + return false, fmt.Errorf("distribution %s not found", distroName) + } + + volumeMounted := false + for _, agentDirectory := range distroMetadata.AgentDirectories { + mountDirectory(podContainerSpec, agentDirectory.DirectoryName) + volumeMounted = true + } + + return volumeMounted, nil +} + +func mountPodVolume(pod *corev1.Pod) { + pod.Spec.Volumes = append(pod.Spec.Volumes, corev1.Volume{ + Name: k8sconsts.OdigosAgentMountVolumeName, + VolumeSource: corev1.VolumeSource{ + HostPath: &corev1.HostPathVolumeSource{ + Path: k8sconsts.OdigosAgentsDirectory, + }, + }, + }) +} + func envVarsExist(containerEnv []corev1.EnvVar, commonEnvVars []corev1.EnvVar) bool { envMap := make(map[string]struct{}) for _, envVar := range containerEnv { diff --git a/instrumentor/runtimemigration/runtimemigration.go b/instrumentor/runtimemigration/runtimemigration.go index 127eb383a0..58678e25d4 100644 --- a/instrumentor/runtimemigration/runtimemigration.go +++ b/instrumentor/runtimemigration/runtimemigration.go @@ -247,7 +247,7 @@ func handleContainerRuntimeDetailsUpdate( continue } - if strings.Contains(*envValue, "/var/odigos") { + if strings.Contains(*envValue, k8sconsts.OdigosAgentsDirectory) { cleanedEnvValue := envOverwrite.CleanupEnvValueFromOdigosAdditions(envKey, *envValue) annotationEnvVarsForContainer[envKey] = &cleanedEnvValue needToUpdateWorkloadAnnotation = true @@ -276,7 +276,7 @@ func handleContainerRuntimeDetailsUpdate( filteredEnvVars := []v1alpha1.EnvVar{} for _, envVar := range containerRuntimeDetails.EnvFromContainerRuntime { - if strings.Contains(envVar.Value, "/var/odigos") { + if strings.Contains(envVar.Value, k8sconsts.OdigosAgentsDirectory) { // Skip the entry continue } @@ -378,7 +378,7 @@ func revertOriginalEnvAnnotationInPlace(originalWorkloadEnvVar *envoverwrite.Ori newContainerEnvs := []corev1.EnvVar{} for _, manifestEnvVar := range containerManifest.Env { - if !strings.Contains(manifestEnvVar.Value, "/var/odigos") { + if !strings.Contains(manifestEnvVar.Value, k8sconsts.OdigosAgentsDirectory) { // we only revert values that odigos overwrote, // if the value is not odigos value, keep it as is newContainerEnvs = append(newContainerEnvs, manifestEnvVar) diff --git a/k8sutils/pkg/cri/criwrapper.go b/k8sutils/pkg/cri/criwrapper.go index 3861d703f8..1a0475ab4b 100644 --- a/k8sutils/pkg/cri/criwrapper.go +++ b/k8sutils/pkg/cri/criwrapper.go @@ -14,6 +14,7 @@ import ( "google.golang.org/grpc/credentials/insecure" criapi "k8s.io/cri-api/pkg/apis/runtime/v1" + "github.com/odigos-io/odigos/api/k8sconsts" odigosv1 "github.com/odigos-io/odigos/api/odigos/v1alpha1" ) @@ -157,7 +158,7 @@ func (rc *CriClient) GetContainerEnvVarsList(ctx context.Context, envVarKeys []s // If the environment variable originates from the device, it will still be observed in the CRI. // In this case, it should not be set as envFromContainerRuntime. // We can be certain that it is not coming from the manifest, as CRI is only queried when the variable is not found in the manifest. - if strings.Contains(value, "/var/odigos") { + if strings.Contains(value, k8sconsts.OdigosAgentsDirectory) { continue } result = append(result, odigosv1.EnvVar{Name: key, Value: value}) diff --git a/odiglet/pkg/instrumentation/fs/agents.go b/odiglet/pkg/instrumentation/fs/agents.go index 267acf4295..f1775590c0 100644 --- a/odiglet/pkg/instrumentation/fs/agents.go +++ b/odiglet/pkg/instrumentation/fs/agents.go @@ -10,12 +10,12 @@ import ( "strings" "syscall" + "github.com/odigos-io/odigos/api/k8sconsts" "github.com/odigos-io/odigos/odiglet/pkg/log" ) const ( containerDir = "/instrumentations" - hostDir = "/var/odigos" chrootDir = "/host" semanagePath = "/sbin/semanage" restoreconPath = "/sbin/restorecon" @@ -38,18 +38,18 @@ func CopyAgentsDirectoryToHost() error { "/var/odigos/python-ebpf/pythonUSDT.abi3.so": {}, } - updatedFilesToKeepMap, err := removeChangedFilesFromKeepMap(filesToKeep, containerDir, hostDir) + updatedFilesToKeepMap, err := removeChangedFilesFromKeepMap(filesToKeep, containerDir, k8sconsts.OdigosAgentsDirectory) if err != nil { log.Logger.Error(err, "Error getting changed files") } - err = removeFilesInDir(hostDir, updatedFilesToKeepMap) + err = removeFilesInDir(k8sconsts.OdigosAgentsDirectory, updatedFilesToKeepMap) if err != nil { log.Logger.Error(err, "Error removing instrumentation directory from host") return err } - err = copyDirectories(containerDir, hostDir, updatedFilesToKeepMap) + err = copyDirectories(containerDir, k8sconsts.OdigosAgentsDirectory, updatedFilesToKeepMap) if err != nil { log.Logger.Error(err, "Error copying instrumentation directory to host") return err @@ -73,7 +73,7 @@ func CopyAgentsDirectoryToHost() error { _, err = exec.LookPath(restoreconPath) if err == nil { // Run the restorecon command to apply the new context - cmd := exec.Command(restoreconPath, "-r", "/var/odigos") + cmd := exec.Command(restoreconPath, "-r", k8sconsts.OdigosAgentsDirectory) err = cmd.Run() if err != nil { log.Logger.Error(err, "Error running restorecon command") From f1be20dd9e7ba75572a0e1f91fb0d54d2c95e130 Mon Sep 17 00:00:00 2001 From: Amir Blum Date: Fri, 7 Feb 2025 13:44:47 +0200 Subject: [PATCH 09/30] chore: migrate ebpf manager from device to distro name env (#2401) As part of the effort to remove instrumentation device, this PR: - add environment variable to containers, `ODIGOS_DISTRO_NAME` to describe the name of the distro injected to the pod. - migrate ebpf manager to match distribution based on the new environment variable with fallback to device so not to break existing users. - fix missing agent directory needed in python - remove device from 4 distros that do not inject any env variables - only need the `/var/odigos` mount, or not. --- api/k8sconsts/envvars.go | 2 + distros/yamls/python-enterprise.yaml | 1 + .../controllers/agentenabled/pods_webhook.go | 94 ++++--------------- .../agentenabled/podswebhook/env.go | 50 ++++++++++ .../agentenabled/podswebhook/mount.go | 33 +++++++ k8sutils/pkg/container/container.go | 28 ++++++ odiglet/pkg/ebpf/distribution_matcher.go | 2 +- odiglet/pkg/ebpf/reporter.go | 1 + odiglet/pkg/ebpf/resolvers.go | 11 +++ .../assert/simple-demo-instrumented.yaml | 5 - 10 files changed, 147 insertions(+), 80 deletions(-) create mode 100644 instrumentor/controllers/agentenabled/podswebhook/env.go create mode 100644 instrumentor/controllers/agentenabled/podswebhook/mount.go diff --git a/api/k8sconsts/envvars.go b/api/k8sconsts/envvars.go index 8788fbcaa6..394f10c4ac 100644 --- a/api/k8sconsts/envvars.go +++ b/api/k8sconsts/envvars.go @@ -4,6 +4,7 @@ const ( OdigosEnvVarNamespace = "ODIGOS_WORKLOAD_NAMESPACE" OdigosEnvVarContainerName = "ODIGOS_CONTAINER_NAME" OdigosEnvVarPodName = "ODIGOS_POD_NAME" + OdigosEnvVarDistroName = "ODIGOS_DISTRO_NAME" ) func OdigosInjectedEnvVars() []string { @@ -11,5 +12,6 @@ func OdigosInjectedEnvVars() []string { OdigosEnvVarNamespace, OdigosEnvVarContainerName, OdigosEnvVarPodName, + OdigosEnvVarDistroName, } } diff --git a/distros/yamls/python-enterprise.yaml b/distros/yamls/python-enterprise.yaml index 11b5749cd9..cb6532a852 100644 --- a/distros/yamls/python-enterprise.yaml +++ b/distros/yamls/python-enterprise.yaml @@ -19,3 +19,4 @@ spec: delimiter: ':' agentDirectories: - directoryName: "{{ODIGOS_AGENTS_DIR}}/python-ebpf" + - directoryName: "{{ODIGOS_AGENTS_DIR}}/python" diff --git a/instrumentor/controllers/agentenabled/pods_webhook.go b/instrumentor/controllers/agentenabled/pods_webhook.go index b2a08cec5c..4b93ec7424 100644 --- a/instrumentor/controllers/agentenabled/pods_webhook.go +++ b/instrumentor/controllers/agentenabled/pods_webhook.go @@ -11,7 +11,7 @@ import ( odigosv1 "github.com/odigos-io/odigos/api/odigos/v1alpha1" "github.com/odigos-io/odigos/common" "github.com/odigos-io/odigos/distros" - "github.com/odigos-io/odigos/distros/distro" + "github.com/odigos-io/odigos/instrumentor/controllers/agentenabled/podswebhook" "github.com/odigos-io/odigos/instrumentor/controllers/utils" podutils "github.com/odigos-io/odigos/instrumentor/internal/pod" webhookdeviceinjector "github.com/odigos-io/odigos/instrumentor/internal/webhook_device_injector" @@ -92,7 +92,12 @@ func (p *PodsWebhook) Default(ctx context.Context, obj runtime.Object) error { continue } - containerVolumeMounted, err := injectOdigosToContainer(containerConfig, podContainerSpec) + if !containerConfig.AgentEnabled || containerConfig.OtelDistroName == "" { + // container config exists, but no agent should be injected by webhook to this container + continue + } + + containerVolumeMounted, err := injectOdigosToContainer(containerConfig, podContainerSpec, *pw) if err != nil { logger.Error(err, "failed to inject ODIGOS agent to container") continue @@ -102,7 +107,7 @@ func (p *PodsWebhook) Default(ctx context.Context, obj runtime.Object) error { if volumeMounted { // only mount the volume if at least one container has a volume to mount - mountPodVolume(pod) + podswebhook.MountPodVolume(pod) } // Inject ODIGOS environment variables and instrumentation device into all containers @@ -148,8 +153,6 @@ func (p *PodsWebhook) podWorkload(ctx context.Context, pod *corev1.Pod) (*k8scon func (p *PodsWebhook) injectOdigosInstrumentation(ctx context.Context, pod *corev1.Pod, ic *odigosv1.InstrumentationConfig, pw *k8sconsts.PodWorkload) error { logger := log.FromContext(ctx) - // Environment variables that remain consistent across all containers - commonEnvVars := getCommonEnvVars() otelSdkToUse, err := getRelevantOtelSDKs(ctx, p.Client, *pw) if err != nil { @@ -175,16 +178,17 @@ func (p *PodsWebhook) injectOdigosInstrumentation(ctx context.Context, pod *core continue } - webhookdeviceinjector.InjectOdigosInstrumentationDevice(*pw, container, otelSdk, runtimeDetails) - webhookenvinjector.InjectOdigosAgentEnvVars(logger, *pw, container, otelSdk, runtimeDetails) - - // Check if the environment variables are already present, if so skip inject them again. - if envVarsExist(container.Env, commonEnvVars) { - continue + // amir: 07 feb 2025. hard-coded temporary list which is removed once all distros migrate away from device + if (runtimeDetails.Language == common.JavascriptProgrammingLanguage && otelSdk == common.OtelSdkEbpfEnterprise) || + (runtimeDetails.Language == common.GoProgrammingLanguage && otelSdk == common.OtelSdkEbpfCommunity) || + (runtimeDetails.Language == common.JavaProgrammingLanguage && otelSdk == common.OtelSdkEbpfEnterprise) || + (runtimeDetails.Language == common.MySQLProgrammingLanguage && otelSdk == common.OtelSdkEbpfEnterprise) { + // Skip device injection for distros that no longer use it + } else { + webhookdeviceinjector.InjectOdigosInstrumentationDevice(*pw, container, otelSdk, runtimeDetails) } - containerNameEnv := corev1.EnvVar{Name: k8sconsts.OdigosEnvVarContainerName, Value: container.Name} - container.Env = append(container.Env, append(commonEnvVars, containerNameEnv)...) + webhookenvinjector.InjectOdigosAgentEnvVars(logger, *pw, container, otelSdk, runtimeDetails) if shouldInjectServiceName(runtimeDetails.Language, otelSdk) { // Ensure the serviceName is fetched only once per pod @@ -215,20 +219,7 @@ func (p *PodsWebhook) injectOdigosInstrumentation(ctx context.Context, pod *core return nil } -func mountDirectory(containerSpec *corev1.Container, dir string) { - // TODO: assuming the directory always starts with {{ODIGOS_AGENTS_DIR}}. This should be validated. - // Should we return errors here to validate static values? - relativePath := strings.TrimPrefix(dir, distro.AgentPlaceholderDirectory+"/") - absolutePath := strings.ReplaceAll(dir, distro.AgentPlaceholderDirectory, k8sconsts.OdigosAgentsDirectory) - containerSpec.VolumeMounts = append(containerSpec.VolumeMounts, corev1.VolumeMount{ - Name: k8sconsts.OdigosAgentMountVolumeName, - SubPath: relativePath, - MountPath: absolutePath, - ReadOnly: true, - }) -} - -func injectOdigosToContainer(containerConfig *odigosv1.ContainerAgentConfig, podContainerSpec *corev1.Container) (bool, error) { +func injectOdigosToContainer(containerConfig *odigosv1.ContainerAgentConfig, podContainerSpec *corev1.Container, pw k8sconsts.PodWorkload) (bool, error) { distroName := containerConfig.OtelDistroName @@ -239,38 +230,14 @@ func injectOdigosToContainer(containerConfig *odigosv1.ContainerAgentConfig, pod volumeMounted := false for _, agentDirectory := range distroMetadata.AgentDirectories { - mountDirectory(podContainerSpec, agentDirectory.DirectoryName) + podswebhook.MountDirectory(podContainerSpec, agentDirectory.DirectoryName) volumeMounted = true } + podswebhook.InjectOdigosK8sEnvVars(podContainerSpec, distroName, pw.Namespace) return volumeMounted, nil } -func mountPodVolume(pod *corev1.Pod) { - pod.Spec.Volumes = append(pod.Spec.Volumes, corev1.Volume{ - Name: k8sconsts.OdigosAgentMountVolumeName, - VolumeSource: corev1.VolumeSource{ - HostPath: &corev1.HostPathVolumeSource{ - Path: k8sconsts.OdigosAgentsDirectory, - }, - }, - }) -} - -func envVarsExist(containerEnv []corev1.EnvVar, commonEnvVars []corev1.EnvVar) bool { - envMap := make(map[string]struct{}) - for _, envVar := range containerEnv { - envMap[envVar.Name] = struct{}{} // Inserting empty struct as value - } - - for _, commonEnvVar := range commonEnvVars { - if _, exists := envMap[commonEnvVar.Name]; exists { // Checking if key exists - return true - } - } - return false -} - func getWorkloadKindAttributeKey(podWorkload *k8sconsts.PodWorkload) attribute.Key { switch podWorkload.Kind { case k8sconsts.WorkloadKindDeployment: @@ -336,27 +303,6 @@ func shouldInjectServiceName(pl common.ProgrammingLanguage, otelsdk common.OtelS return false } -func getCommonEnvVars() []corev1.EnvVar { - return []corev1.EnvVar{ - { - Name: k8sconsts.OdigosEnvVarNamespace, - ValueFrom: &corev1.EnvVarSource{ - FieldRef: &corev1.ObjectFieldSelector{ - FieldPath: "metadata.namespace", - }, - }, - }, - { - Name: k8sconsts.OdigosEnvVarPodName, - ValueFrom: &corev1.EnvVarSource{ - FieldRef: &corev1.ObjectFieldSelector{ - FieldPath: "metadata.name", - }, - }, - }, - } -} - // checks for the service name on the annotation, or fallback to the workload name func (p *PodsWebhook) getServiceNameForEnv(ctx context.Context, logger logr.Logger, podWorkload *k8sconsts.PodWorkload) *string { workloadObj := workload.ClientObjectFromWorkloadKind(podWorkload.Kind) diff --git a/instrumentor/controllers/agentenabled/podswebhook/env.go b/instrumentor/controllers/agentenabled/podswebhook/env.go new file mode 100644 index 0000000000..a1b88d59c7 --- /dev/null +++ b/instrumentor/controllers/agentenabled/podswebhook/env.go @@ -0,0 +1,50 @@ +package podswebhook + +import ( + "github.com/odigos-io/odigos/api/k8sconsts" + corev1 "k8s.io/api/core/v1" +) + +func InjectOdigosK8sEnvVars(container *corev1.Container, distroName string, ns string) { + + // check for existing env vars so we don't introduce them again + existingEnvNames := make(map[string]struct{}) + for _, envVar := range container.Env { + existingEnvNames[envVar.Name] = struct{}{} + } + + injectEnvVarToPodContainer(&existingEnvNames, container, k8sconsts.OdigosEnvVarContainerName, container.Name) + injectEnvVarToPodContainer(&existingEnvNames, container, k8sconsts.OdigosEnvVarDistroName, distroName) + injectEnvVarObjectFieldRefToPodContainer(&existingEnvNames, container, k8sconsts.OdigosEnvVarPodName, "metadata.name") + injectEnvVarToPodContainer(&existingEnvNames, container, k8sconsts.OdigosEnvVarNamespace, ns) +} + +func injectEnvVarObjectFieldRefToPodContainer(existingEnvNames *map[string]struct{}, container *corev1.Container, envVarName, envVarRef string) { + if _, exists := (*existingEnvNames)[envVarName]; exists { + return + } + + container.Env = append(container.Env, corev1.EnvVar{ + Name: envVarName, + ValueFrom: &corev1.EnvVarSource{ + FieldRef: &corev1.ObjectFieldSelector{ + FieldPath: envVarRef, + }, + }, + }) + + (*existingEnvNames)[envVarName] = struct{}{} +} + +func injectEnvVarToPodContainer(existingEnvNames *map[string]struct{}, container *corev1.Container, envVarName, envVarValue string) { + if _, exists := (*existingEnvNames)[envVarName]; exists { + return + } + + container.Env = append(container.Env, corev1.EnvVar{ + Name: envVarName, + Value: envVarValue, + }) + + (*existingEnvNames)[envVarName] = struct{}{} +} diff --git a/instrumentor/controllers/agentenabled/podswebhook/mount.go b/instrumentor/controllers/agentenabled/podswebhook/mount.go new file mode 100644 index 0000000000..011875f68f --- /dev/null +++ b/instrumentor/controllers/agentenabled/podswebhook/mount.go @@ -0,0 +1,33 @@ +package podswebhook + +import ( + "strings" + + "github.com/odigos-io/odigos/api/k8sconsts" + "github.com/odigos-io/odigos/distros/distro" + corev1 "k8s.io/api/core/v1" +) + +func MountDirectory(containerSpec *corev1.Container, dir string) { + // TODO: assuming the directory always starts with {{ODIGOS_AGENTS_DIR}}. This should be validated. + // Should we return errors here to validate static values? + relativePath := strings.TrimPrefix(dir, distro.AgentPlaceholderDirectory+"/") + absolutePath := strings.ReplaceAll(dir, distro.AgentPlaceholderDirectory, k8sconsts.OdigosAgentsDirectory) + containerSpec.VolumeMounts = append(containerSpec.VolumeMounts, corev1.VolumeMount{ + Name: k8sconsts.OdigosAgentMountVolumeName, + SubPath: relativePath, + MountPath: absolutePath, + ReadOnly: true, + }) +} + +func MountPodVolume(pod *corev1.Pod) { + pod.Spec.Volumes = append(pod.Spec.Volumes, corev1.Volume{ + Name: k8sconsts.OdigosAgentMountVolumeName, + VolumeSource: corev1.VolumeSource{ + HostPath: &corev1.HostPathVolumeSource{ + Path: k8sconsts.OdigosAgentsDirectory, + }, + }, + }) +} diff --git a/k8sutils/pkg/container/container.go b/k8sutils/pkg/container/container.go index 939e844430..3d176a2393 100644 --- a/k8sutils/pkg/container/container.go +++ b/k8sutils/pkg/container/container.go @@ -14,6 +14,34 @@ var ( ErrContainerNotInPodSpec = errors.New("container not found in pod spec") ) +func LanguageAndSdk(pod *v1.Pod, containerName string, distroName string) (common.ProgrammingLanguage, common.OtelSdk, error) { + if distroName != "" { + // TODO: so we can remove the device slowly while having backward compatibility, + // we map here the distroNames one by one. + // this is temporary, and should be refactored once device is removed + switch distroName { + case "golang-community": + return common.GoProgrammingLanguage, common.OtelSdkEbpfCommunity, nil + case "golang-enterprise": + return common.GoProgrammingLanguage, common.OtelSdkEbpfEnterprise, nil + case "java-enterprise": + return common.JavaProgrammingLanguage, common.OtelSdkNativeEnterprise, nil + case "java-ebpf-instrumentations": + return common.JavaProgrammingLanguage, common.OtelSdkEbpfEnterprise, nil + case "python-enterprise": + return common.PythonProgrammingLanguage, common.OtelSdkEbpfEnterprise, nil + case "nodejs-enterprise": + return common.JavascriptProgrammingLanguage, common.OtelSdkEbpfEnterprise, nil + case "mysql-enterprise": + return common.MySQLProgrammingLanguage, common.OtelSdkEbpfEnterprise, nil + } + } + + // TODO: this is fallback for migration from device (so that we can handle pods that have not been updated yet) + // remove this once device is removed + return LanguageSdkFromPodContainer(pod, containerName) +} + func LanguageSdkFromPodContainer(pod *v1.Pod, containerName string) (common.ProgrammingLanguage, common.OtelSdk, error) { for i := range pod.Spec.Containers { container := pod.Spec.Containers[i] diff --git a/odiglet/pkg/ebpf/distribution_matcher.go b/odiglet/pkg/ebpf/distribution_matcher.go index fdb345e73a..20bb947011 100644 --- a/odiglet/pkg/ebpf/distribution_matcher.go +++ b/odiglet/pkg/ebpf/distribution_matcher.go @@ -15,7 +15,7 @@ type podDeviceDistributionMatcher struct{} func (dm *podDeviceDistributionMatcher) Distribution(ctx context.Context, e K8sProcessDetails) (instrumentation.OtelDistribution, error) { // get the language and sdk for this process event // based on the pod spec and the container name from the process event - lang, sdk, err := odgiosK8s.LanguageSdkFromPodContainer(e.pod, e.containerName) + lang, sdk, err := odgiosK8s.LanguageAndSdk(e.pod, e.containerName, e.distroName) if err != nil { return instrumentation.OtelDistribution{}, fmt.Errorf("failed to get language and sdk: %w", err) } diff --git a/odiglet/pkg/ebpf/reporter.go b/odiglet/pkg/ebpf/reporter.go index 8392f803c1..08985489f7 100644 --- a/odiglet/pkg/ebpf/reporter.go +++ b/odiglet/pkg/ebpf/reporter.go @@ -20,6 +20,7 @@ import ( type K8sProcessDetails struct { pod *corev1.Pod containerName string + distroName string pw *k8sconsts.PodWorkload procEvent detector.ProcessEvent } diff --git a/odiglet/pkg/ebpf/resolvers.go b/odiglet/pkg/ebpf/resolvers.go index a324d764ce..6cdeaf40a8 100644 --- a/odiglet/pkg/ebpf/resolvers.go +++ b/odiglet/pkg/ebpf/resolvers.go @@ -27,6 +27,11 @@ func (dr *k8sDetailsResolver) Resolve(ctx context.Context, event detector.Proces return K8sProcessDetails{}, errContainerNameNotReported } + distroName, found := distroNameFromProcEvent(event) + if !found { + // TODO: this is ok for migration period. Once device is removed, this should be an error + } + podWorkload, err := workload.PodWorkloadObjectOrError(ctx, pod) if err != nil { return K8sProcessDetails{}, fmt.Errorf("failed to find workload object from pod manifest owners references: %w", err) @@ -35,6 +40,7 @@ func (dr *k8sDetailsResolver) Resolve(ctx context.Context, event detector.Proces return K8sProcessDetails{ pod: pod, containerName: containerName, + distroName: distroName, pw: podWorkload, procEvent: event, }, nil @@ -67,6 +73,11 @@ func containerNameFromProcEvent(event detector.ProcessEvent) (string, bool) { return containerName, ok } +func distroNameFromProcEvent(event detector.ProcessEvent) (string, bool) { + distronName, ok := event.ExecDetails.Environments[k8sconsts.OdigosEnvVarDistroName] + return distronName, ok +} + type k8sConfigGroupResolver struct{} func (cr *k8sConfigGroupResolver) Resolve(ctx context.Context, d K8sProcessDetails, dist instrumentation.OtelDistribution) (K8sConfigGroup, error) { diff --git a/tests/common/assert/simple-demo-instrumented.yaml b/tests/common/assert/simple-demo-instrumented.yaml index 7bdaffda6c..c7878190fb 100644 --- a/tests/common/assert/simple-demo-instrumented.yaml +++ b/tests/common/assert/simple-demo-instrumented.yaml @@ -110,11 +110,6 @@ spec: - "true" containers: - name: membership - resources: - limits: - instrumentation.odigos.io/go-ebpf-community: "1" - requests: - instrumentation.odigos.io/go-ebpf-community: "1" status: containerStatuses: - name: membership From 12e8942a071f29203ec20955a3d10dd18bf735af Mon Sep 17 00:00:00 2001 From: Ron Federman <73110295+RonFed@users.noreply.github.com> Date: Fri, 7 Feb 2025 15:32:58 +0200 Subject: [PATCH 10/30] fix: re-queue if failed to rollout (#2402) Co-authored-by: Amir Blum --- instrumentor/controllers/agentenabled/sync.go | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/instrumentor/controllers/agentenabled/sync.go b/instrumentor/controllers/agentenabled/sync.go index e3c844db4c..5eee3546ac 100644 --- a/instrumentor/controllers/agentenabled/sync.go +++ b/instrumentor/controllers/agentenabled/sync.go @@ -2,7 +2,6 @@ package agentenabled import ( "context" - "errors" "fmt" "github.com/hashicorp/go-version" @@ -40,22 +39,20 @@ type agentInjectedStatusCondition struct { } func reconcileAll(ctx context.Context, c client.Client) (ctrl.Result, error) { - allInstrumentationConfigs := odigosv1.InstrumentationConfigList{} listErr := c.List(ctx, &allInstrumentationConfigs) if listErr != nil { return ctrl.Result{}, listErr } - var err error for _, ic := range allInstrumentationConfigs.Items { - _, workloadErr := reconcileWorkload(ctx, c, ic.Name, ic.Namespace) - if workloadErr != nil { - err = errors.Join(err, workloadErr) + res, err := reconcileWorkload(ctx, c, ic.Name, ic.Namespace) + if err != nil || !res.IsZero() { + return res, err } } - return ctrl.Result{}, err + return ctrl.Result{}, nil } func reconcileWorkload(ctx context.Context, c client.Client, icName string, namespace string) (ctrl.Result, error) { From 3c5a428f9d6d490c57f8902536f4cef96f8fd02a Mon Sep 17 00:00:00 2001 From: Ben Elferink Date: Fri, 7 Feb 2025 17:05:58 +0200 Subject: [PATCH 11/30] Fix typos (#2403) Fixed 2 typos introduced in #2396 --- api/config/crd/bases/odigos.io_instrumentationrules.yaml | 5 ++--- api/odigos/v1alpha1/instrumentationrule_type.go | 2 +- api/odigos/v1alpha1/instrumentationrules/otel-sdk.go | 3 +-- docs/api-reference/odigos.io.v1alpha1.mdx | 2 +- .../templates/crds/odigos.io_instrumentationrules.yaml | 5 ++--- 5 files changed, 7 insertions(+), 10 deletions(-) diff --git a/api/config/crd/bases/odigos.io_instrumentationrules.yaml b/api/config/crd/bases/odigos.io_instrumentationrules.yaml index d835f060ad..b816b5d415 100644 --- a/api/config/crd/bases/odigos.io_instrumentationrules.yaml +++ b/api/config/crd/bases/odigos.io_instrumentationrules.yaml @@ -135,8 +135,7 @@ spec: description: |- Set a list of distribution names that take priority over the default distributions. if a language is not in this list, the default distribution will be used. - it multiple distributions are specified for the same language, in one or many rules, - the behavior is undefined. + if multiple distributions are specified for the same language, in one or many rules, the behavior is undefined. items: type: string type: array @@ -144,7 +143,7 @@ spec: - otelDistroNames type: object otelSdks: - description: 'Deprecated: use OrelDistros instead.' + description: 'Deprecated: use OtelDistros instead.' properties: otelSdkByLanguage: additionalProperties: diff --git a/api/odigos/v1alpha1/instrumentationrule_type.go b/api/odigos/v1alpha1/instrumentationrule_type.go index 83e195b051..cc4d7211bf 100644 --- a/api/odigos/v1alpha1/instrumentationrule_type.go +++ b/api/odigos/v1alpha1/instrumentationrule_type.go @@ -61,7 +61,7 @@ type InstrumentationRuleSpec struct { // Allows to configure payload collection aspects for different types of payloads. PayloadCollection *instrumentationrules.PayloadCollection `json:"payloadCollection,omitempty"` - // Deprecated: use OrelDistros instead. + // Deprecated: use OtelDistros instead. OtelSdks *instrumentationrules.OtelSdks `json:"otelSdks,omitempty"` // Set the otel distros to use instead of the defaults. diff --git a/api/odigos/v1alpha1/instrumentationrules/otel-sdk.go b/api/odigos/v1alpha1/instrumentationrules/otel-sdk.go index 5ed92b784a..90aa0c5206 100644 --- a/api/odigos/v1alpha1/instrumentationrules/otel-sdk.go +++ b/api/odigos/v1alpha1/instrumentationrules/otel-sdk.go @@ -15,7 +15,6 @@ type OtelDistros struct { // Set a list of distribution names that take priority over the default distributions. // if a language is not in this list, the default distribution will be used. - // it multiple distributions are specified for the same language, in one or many rules, - // the behavior is undefined. + // if multiple distributions are specified for the same language, in one or many rules, the behavior is undefined. OtelDistroNames []string `json:"otelDistroNames"` } diff --git a/docs/api-reference/odigos.io.v1alpha1.mdx b/docs/api-reference/odigos.io.v1alpha1.mdx index f859666751..684c59aa37 100644 --- a/docs/api-reference/odigos.io.v1alpha1.mdx +++ b/docs/api-reference/odigos.io.v1alpha1.mdx @@ -1869,7 +1869,7 @@ If empty, no instrumentation libraries will be used.

instrumentationrules.OtelSdks -

Deprecated: use OrelDistros instead.

+

Deprecated: use OtelDistros instead.

diff --git a/helm/odigos/templates/crds/odigos.io_instrumentationrules.yaml b/helm/odigos/templates/crds/odigos.io_instrumentationrules.yaml index d835f060ad..b816b5d415 100644 --- a/helm/odigos/templates/crds/odigos.io_instrumentationrules.yaml +++ b/helm/odigos/templates/crds/odigos.io_instrumentationrules.yaml @@ -135,8 +135,7 @@ spec: description: |- Set a list of distribution names that take priority over the default distributions. if a language is not in this list, the default distribution will be used. - it multiple distributions are specified for the same language, in one or many rules, - the behavior is undefined. + if multiple distributions are specified for the same language, in one or many rules, the behavior is undefined. items: type: string type: array @@ -144,7 +143,7 @@ spec: - otelDistroNames type: object otelSdks: - description: 'Deprecated: use OrelDistros instead.' + description: 'Deprecated: use OtelDistros instead.' properties: otelSdkByLanguage: additionalProperties: From 5c4afe1b0c8690dfae624aadaf761148bb26cabe Mon Sep 17 00:00:00 2001 From: Ron Federman <73110295+RonFed@users.noreply.github.com> Date: Fri, 7 Feb 2025 21:59:45 +0200 Subject: [PATCH 12/30] fix: use retry watchers is UI (#2404) Co-authored-by: Ben Elferink --- frontend/kube/watchers/destination_watcher.go | 10 +++++-- .../instrumentation_config_watcher.go | 10 +++++-- .../instrumentation_instance_watcher.go | 10 +++++-- .../services/collector_metrics/watchers.go | 27 ++++++++++++++----- 4 files changed, 44 insertions(+), 13 deletions(-) diff --git a/frontend/kube/watchers/destination_watcher.go b/frontend/kube/watchers/destination_watcher.go index bf42da35e0..b43f17ed32 100644 --- a/frontend/kube/watchers/destination_watcher.go +++ b/frontend/kube/watchers/destination_watcher.go @@ -3,6 +3,7 @@ package watchers import ( "context" "fmt" + "log" "time" "github.com/odigos-io/odigos/api/odigos/v1alpha1" @@ -11,6 +12,8 @@ import ( "github.com/odigos-io/odigos/frontend/services/sse" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" + "k8s.io/client-go/tools/cache" + toolsWatch "k8s.io/client-go/tools/watch" ) var destinationAddedEventBatcher *EventBatcher @@ -63,9 +66,11 @@ func StartDestinationWatcher(ctx context.Context, namespace string) error { }, ) - watcher, err := kube.DefaultClient.OdigosClient.Destinations(namespace).Watch(context.Background(), metav1.ListOptions{}) + watcher, err := toolsWatch.NewRetryWatcher("1", &cache.ListWatch{WatchFunc: func(_ metav1.ListOptions) (watch.Interface, error) { + return kube.DefaultClient.OdigosClient.Destinations(namespace).Watch(ctx, metav1.ListOptions{}) + }}) if err != nil { - return fmt.Errorf("error creating watcher: %v", err) + return fmt.Errorf("error creating destinations watcher: %v", err) } go handleDestinationWatchEvents(ctx, watcher) @@ -84,6 +89,7 @@ func handleDestinationWatchEvents(ctx context.Context, watcher watch.Interface) return case event, ok := <-ch: if !ok { + log.Println("Destination watcher closed") return } switch event.Type { diff --git a/frontend/kube/watchers/instrumentation_config_watcher.go b/frontend/kube/watchers/instrumentation_config_watcher.go index 9cae42c92f..19c73df8bb 100644 --- a/frontend/kube/watchers/instrumentation_config_watcher.go +++ b/frontend/kube/watchers/instrumentation_config_watcher.go @@ -3,6 +3,7 @@ package watchers import ( "context" "fmt" + "log" "time" "github.com/odigos-io/odigos/api/odigos/v1alpha1" @@ -12,6 +13,8 @@ import ( commonutils "github.com/odigos-io/odigos/k8sutils/pkg/workload" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" + "k8s.io/client-go/tools/cache" + toolsWatch "k8s.io/client-go/tools/watch" ) var instrumentationConfigAddedEventBatcher *EventBatcher @@ -64,9 +67,11 @@ func StartInstrumentationConfigWatcher(ctx context.Context, namespace string) er }, ) - watcher, err := kube.DefaultClient.OdigosClient.InstrumentationConfigs(namespace).Watch(context.Background(), metav1.ListOptions{}) + watcher, err := toolsWatch.NewRetryWatcher("1", &cache.ListWatch{WatchFunc: func(_ metav1.ListOptions) (watch.Interface, error) { + return kube.DefaultClient.OdigosClient.InstrumentationConfigs(namespace).Watch(ctx, metav1.ListOptions{}) + }}) if err != nil { - return fmt.Errorf("error creating watcher: %w", err) + return fmt.Errorf("failed to create instrumentation config watcher: %w", err) } go handleInstrumentationConfigWatchEvents(ctx, watcher) @@ -85,6 +90,7 @@ func handleInstrumentationConfigWatchEvents(ctx context.Context, watcher watch.I return case event, ok := <-ch: if !ok { + log.Println("InstrumentationConfig watcher closed") return } switch event.Type { diff --git a/frontend/kube/watchers/instrumentation_instance_watcher.go b/frontend/kube/watchers/instrumentation_instance_watcher.go index f3e8e2d549..d8ec4bdcbe 100644 --- a/frontend/kube/watchers/instrumentation_instance_watcher.go +++ b/frontend/kube/watchers/instrumentation_instance_watcher.go @@ -3,6 +3,7 @@ package watchers import ( "context" "fmt" + "log" "time" "github.com/odigos-io/odigos/api/odigos/v1alpha1" @@ -12,6 +13,8 @@ import ( commonutils "github.com/odigos-io/odigos/k8sutils/pkg/workload" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" + "k8s.io/client-go/tools/cache" + toolsWatch "k8s.io/client-go/tools/watch" ) var instrumentationInstanceModifiedEventBatcher *EventBatcher @@ -30,9 +33,11 @@ func StartInstrumentationInstanceWatcher(ctx context.Context, namespace string) }, ) - watcher, err := kube.DefaultClient.OdigosClient.InstrumentationInstances(namespace).Watch(context.Background(), metav1.ListOptions{}) + watcher, err := toolsWatch.NewRetryWatcher("1", &cache.ListWatch{WatchFunc: func(_ metav1.ListOptions) (watch.Interface, error) { + return kube.DefaultClient.OdigosClient.InstrumentationInstances(namespace).Watch(ctx, metav1.ListOptions{}) + }}) if err != nil { - return fmt.Errorf("error creating watcher: %v", err) + return fmt.Errorf("failed to create instrumentation instance watcher: %w", err) } go handleInstrumentationInstanceWatchEvents(ctx, watcher) @@ -49,6 +54,7 @@ func handleInstrumentationInstanceWatchEvents(ctx context.Context, watcher watch return case event, ok := <-ch: if !ok { + log.Println("InstrumentationInstance watcher closed") return } switch event.Type { diff --git a/frontend/services/collector_metrics/watchers.go b/frontend/services/collector_metrics/watchers.go index 0ad1223821..bce7167e93 100644 --- a/frontend/services/collector_metrics/watchers.go +++ b/frontend/services/collector_metrics/watchers.go @@ -5,14 +5,16 @@ import ( "errors" "fmt" + "github.com/odigos-io/odigos/api/k8sconsts" "github.com/odigos-io/odigos/api/odigos/v1alpha1" "github.com/odigos-io/odigos/frontend/kube" "github.com/odigos-io/odigos/frontend/services/common" - "github.com/odigos-io/odigos/api/k8sconsts" commonutils "github.com/odigos-io/odigos/k8sutils/pkg/workload" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" + "k8s.io/client-go/tools/cache" + toolsWatch "k8s.io/client-go/tools/watch" ) type notification struct { @@ -43,27 +45,38 @@ type watchers struct { } func runWatcher(ctx context.Context, cw *deleteWatcher) error { - nodeWatcher, err := newCollectorWatcher(ctx, cw.odigosNS, k8sconsts.CollectorsRoleNodeCollector) + nodeCollectorWatcher, err := toolsWatch.NewRetryWatcher("1", &cache.ListWatch{WatchFunc: func(_ metav1.ListOptions) (watch.Interface, error) { + return newCollectorWatcher(ctx, cw.odigosNS, k8sconsts.CollectorsRoleNodeCollector) + }}) if err != nil { return err } - clusterWatcher, err := newCollectorWatcher(ctx, cw.odigosNS, k8sconsts.CollectorsRoleClusterGateway) + + clusterCollectorWatcher, err := toolsWatch.NewRetryWatcher("1", &cache.ListWatch{WatchFunc: func(_ metav1.ListOptions) (watch.Interface, error) { + return newCollectorWatcher(ctx, cw.odigosNS, k8sconsts.CollectorsRoleClusterGateway) + }}) if err != nil { return err } - destsWatcher, err := kube.DefaultClient.OdigosClient.Destinations(cw.odigosNS).Watch(ctx, metav1.ListOptions{}) + + sourcesWatcher, err := toolsWatch.NewRetryWatcher("1", &cache.ListWatch{WatchFunc: func(_ metav1.ListOptions) (watch.Interface, error) { + return kube.DefaultClient.OdigosClient.InstrumentationConfigs("").Watch(ctx, metav1.ListOptions{}) + }}) if err != nil { return err } - sourcesWatcher, err := kube.DefaultClient.OdigosClient.InstrumentationConfigs("").Watch(ctx, metav1.ListOptions{}) + + destsWatcher, err := toolsWatch.NewRetryWatcher("1", &cache.ListWatch{WatchFunc: func(_ metav1.ListOptions) (watch.Interface, error) { + return kube.DefaultClient.OdigosClient.Destinations(cw.odigosNS).Watch(ctx, metav1.ListOptions{}) + }}) if err != nil { return err } return runWatcherLoop(ctx, watchers{ - nodeCollectors: nodeWatcher, - clusterCollectors: clusterWatcher, + nodeCollectors: nodeCollectorWatcher, + clusterCollectors: clusterCollectorWatcher, destinations: destsWatcher, sources: sourcesWatcher, }, cw.deleteNotifications) From 5cee79831e3864719ba0914ac3e9f395128c244d Mon Sep 17 00:00:00 2001 From: Amir Blum Date: Sat, 8 Feb 2025 11:17:21 +0200 Subject: [PATCH 13/30] chore: add make target for e2e tests grafana (#2410) Just to make troubleshooting easier when running the tests locally. --- Makefile | 22 ++++++++++++++++++++++ tests/e2e/README.md | 25 ++++++++++++++++++++++++- 2 files changed, 46 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f15a7ad590..82c5de83ec 100644 --- a/Makefile +++ b/Makefile @@ -337,6 +337,28 @@ dev-tests-setup: dev-tests-kind-cluster cli-build build-images load-to-kind dev-tests-setup-no-build: TAG := e2e-test dev-tests-setup-no-build: dev-tests-kind-cluster load-to-kind +# When you run an e2e test locally, and want a grafana instance to troubleshoot the results +# run this target to start grafana, then run dev-tests-grafana-port-forward to access it. +.PHONY: dev-tests-grafana +dev-tests-grafana: + @echo "Starting Grafana for troubleshooting e2e tests" + helm install -n traces grafana grafana/grafana \ + --set "env.GF_AUTH_ANONYMOUS_ENABLED=true" \ + --set "env.GF_AUTH_ANONYMOUS_ORG_ROLE=Admin" \ + --set "datasources.datasources\.yaml.apiVersion=1" \ + --set "datasources.datasources\.yaml.datasources[0].name=Tempo" \ + --set "datasources.datasources\.yaml.datasources[0].type=tempo" \ + --set "datasources.datasources\.yaml.datasources[0].url=http://e2e-tests-tempo:3100" \ + --set "datasources.datasources\.yaml.datasources[0].access=proxy" \ + --set "datasources.datasources\.yaml.datasources[0].isDefault=true" + +# For e2e local tests, run this target to port forward the Grafana instance to your local browser +.PHONY: dev-tests-grafana-port-forward +dev-tests-grafana-port-forward: + @echo "Port forwarding Grafana for troubleshooting e2e tests" + @echo "Visit http://localhost:3080/explore to access Grafana" + kubectl port-forward -n traces svc/grafana 3080:80 + # Use this for debug to add a destination which only prints samples of telemetry items to the cluster gateway collector logs .PHONY: dev-debug-destination dev-debug-destination: diff --git a/tests/e2e/README.md b/tests/e2e/README.md index 1d434da94f..45177836e1 100644 --- a/tests/e2e/README.md +++ b/tests/e2e/README.md @@ -130,7 +130,24 @@ tests/e2e/common/traceql_runner.sh When tests fail, and it's related to some traceql query not succeeding, it can be useful to setup a grafana ui to commit queries and see the traces that are stored in tempo. -- Install grafana with helm: +### TL;DR + +```bash +make dev-tests-grafana +make dev-tests-grafana-port-forward +``` + +Then browse to `http://localhost:3080/explore`. + +### Detailed Steps + +- Install grafana with helm once: + +```bash +make dev-tests-grafana +``` + +or manually: ```bash helm install -n traces grafana grafana/grafana \ @@ -146,6 +163,12 @@ helm install -n traces grafana grafana/grafana \ - Port forward to the grafana service: +```bash +make dev-tests-grafana-port-forward +``` + +or manually: + ```bash kubectl port-forward svc/grafana 3080:80 -n traces ``` From fb4fa7f540ec873f179bda487725a6bb8831765b Mon Sep 17 00:00:00 2001 From: Ron Federman <73110295+RonFed@users.noreply.github.com> Date: Sat, 8 Feb 2025 12:24:59 +0200 Subject: [PATCH 14/30] fix: requeue if failed to trigger an un-instrument rollout (#2406) --- .../agentenabled/rollout/rollout.go | 6 +- tests/e2e/source/chainsaw-test.yaml | 82 ++++--------------- tests/e2e/source/wait_for_rollout.sh | 19 +++++ 3 files changed, 37 insertions(+), 70 deletions(-) create mode 100755 tests/e2e/source/wait_for_rollout.sh diff --git a/instrumentor/controllers/agentenabled/rollout/rollout.go b/instrumentor/controllers/agentenabled/rollout/rollout.go index 0eb3d6a565..b2dc29044b 100644 --- a/instrumentor/controllers/agentenabled/rollout/rollout.go +++ b/instrumentor/controllers/agentenabled/rollout/rollout.go @@ -42,11 +42,9 @@ func Do(ctx context.Context, c client.Client, ic *odigosv1alpha1.Instrumentation if ic == nil { // instrumentation config is deleted, trigger a rollout for the associated workload // this should happen once per workload, as the instrumentation config is deleted + // and we want to rollout the workload to remove the instrumentation rolloutErr := rolloutRestartWorkload(ctx, workloadObj, c, time.Now()) - if rolloutErr != nil { - logger.Error(rolloutErr, "error rolling out workload", "name", pw.Name, "namespace", pw.Namespace) - } - return ctrl.Result{}, nil + return ctrl.Result{}, client.IgnoreNotFound(rolloutErr) } savedRolloutHash := ic.Status.WorkloadRolloutHash diff --git a/tests/e2e/source/chainsaw-test.yaml b/tests/e2e/source/chainsaw-test.yaml index dedfbc7b27..f130cb956c 100644 --- a/tests/e2e/source/chainsaw-test.yaml +++ b/tests/e2e/source/chainsaw-test.yaml @@ -94,12 +94,7 @@ spec: file: 01-workloads.yaml - script: timeout: 70s - content: | - kubectl rollout status deployment -l app=coupon - kubectl rollout status deployment -l app=frontend - kubectl rollout status deployment -l app=inventory - kubectl rollout status deployment -l app=pricing - kubectl rollout status deployment -l app=membership + content: ./wait_for_rollout.sh - name: Generate Traffic try: - script: @@ -181,12 +176,7 @@ spec: try: - script: timeout: 70s - content: | - kubectl rollout status deployment -l app=coupon - kubectl rollout status deployment -l app=frontend - kubectl rollout status deployment -l app=inventory - kubectl rollout status deployment -l app=pricing - kubectl rollout status deployment -l app=membership + content: ./wait_for_rollout.sh - name: Instrument Namespace try: - apply: @@ -205,12 +195,7 @@ spec: file: ../../common/assert/simple-demo-instrumented.yaml - script: timeout: 70s - content: | - kubectl rollout status deployment -l app=coupon - kubectl rollout status deployment -l app=frontend - kubectl rollout status deployment -l app=inventory - kubectl rollout status deployment -l app=pricing - kubectl rollout status deployment -l app=membership + content: ./wait_for_rollout.sh - name: Generate Traffic try: - script: @@ -290,12 +275,7 @@ spec: file: 04-workloads.yaml - script: timeout: 70s - content: | - kubectl rollout status deployment -l app=coupon - kubectl rollout status deployment -l app=frontend - kubectl rollout status deployment -l app=inventory - kubectl rollout status deployment -l app=pricing - kubectl rollout status deployment -l app=membership + content: ./wait_for_rollout.sh - name: Instrument frontend workload specifically try: - apply: @@ -312,16 +292,16 @@ spec: try: - script: timeout: 70s - content: | - kubectl rollout status deployment -l app=coupon - kubectl rollout status deployment -l app=frontend - kubectl rollout status deployment -l app=inventory - kubectl rollout status deployment -l app=pricing - kubectl rollout status deployment -l app=membership + content: ./wait_for_rollout.sh - name: Instrument rest of Namespace try: - apply: file: ../../common/apply/instrument-default-ns.yaml + - name: Wait for workloads to roll out new revisions + try: + - script: + timeout: 70s + content: ./wait_for_rollout.sh - name: Assert Runtime Detected for all workloads try: - assert: @@ -347,12 +327,7 @@ spec: try: - script: timeout: 70s - content: | - kubectl rollout status deployment -l app=coupon - kubectl rollout status deployment -l app=frontend - kubectl rollout status deployment -l app=inventory - kubectl rollout status deployment -l app=pricing - kubectl rollout status deployment -l app=membership + content: ./wait_for_rollout.sh - name: Assert Runtime still Detected for single workload try: - assert: @@ -373,12 +348,7 @@ spec: try: - script: timeout: 70s - content: | - kubectl rollout status deployment -l app=coupon - kubectl rollout status deployment -l app=frontend - kubectl rollout status deployment -l app=inventory - kubectl rollout status deployment -l app=pricing - kubectl rollout status deployment -l app=membership + content: ./wait_for_rollout.sh - name: Assert runtime detected for all workloads except excluded (coupon) try: - assert: @@ -403,12 +373,7 @@ spec: try: - script: timeout: 70s - content: | - kubectl rollout status deployment -l app=coupon - kubectl rollout status deployment -l app=frontend - kubectl rollout status deployment -l app=inventory - kubectl rollout status deployment -l app=pricing - kubectl rollout status deployment -l app=membership + content: ./wait_for_rollout.sh - name: Assert runtime detected for no-longer-excluded workload try: - assert: @@ -425,12 +390,7 @@ spec: try: - script: timeout: 70s - content: | - kubectl rollout status deployment -l app=coupon - kubectl rollout status deployment -l app=frontend - kubectl rollout status deployment -l app=inventory - kubectl rollout status deployment -l app=pricing - kubectl rollout status deployment -l app=membership + content: ./wait_for_rollout.sh - name: Assert runtime detected for all workloads except newly excluded (membership) try: - assert: @@ -454,12 +414,7 @@ spec: try: - script: timeout: 70s - content: | - kubectl rollout status deployment -l app=coupon - kubectl rollout status deployment -l app=frontend - kubectl rollout status deployment -l app=inventory - kubectl rollout status deployment -l app=pricing - kubectl rollout status deployment -l app=membership + content: ./wait_for_rollout.sh - name: Assert runtime detected for no-longer-excluded workload try: - assert: @@ -477,12 +432,7 @@ spec: try: - script: timeout: 70s - content: | - kubectl rollout status deployment -l app=coupon - kubectl rollout status deployment -l app=frontend - kubectl rollout status deployment -l app=inventory - kubectl rollout status deployment -l app=pricing - kubectl rollout status deployment -l app=membership + content: ./wait_for_rollout.sh - name: Assert runtime not detected for re-excluded (membership) try: - script: diff --git a/tests/e2e/source/wait_for_rollout.sh b/tests/e2e/source/wait_for_rollout.sh new file mode 100755 index 0000000000..1fa09fd566 --- /dev/null +++ b/tests/e2e/source/wait_for_rollout.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +# some of the rollouts during the test are triggered by patching an annotation on the workload. +# the annotation value is a timestamp. This timestamp has a resolution of seconds, so we need to wait +# at least 1 second before we can be sure that the rollout has been triggered. +# +# The controller itself could check this timestamp and wait for the next second to trigger the rollout, +# however for now we decided to not implement it as it seems extremely unlikely that this would happen in a real-world scenario. +# +# this is also consistent with the behavior of `kubectl rollout restart deployment ...` which also has a resolution of seconds. +# trying to do a few consecutive `kubectl rollout restart deployment ...` may result in an error such as +# "if restart has already been triggered within the past second, please wait before attempting to trigger another" +sleep 1 + +kubectl rollout status deployment -l app=coupon +kubectl rollout status deployment -l app=frontend +kubectl rollout status deployment -l app=inventory +kubectl rollout status deployment -l app=pricing +kubectl rollout status deployment -l app=membership \ No newline at end of file From 92ae0f473de8f5cb896cfbe1dfddfd812a36159d Mon Sep 17 00:00:00 2001 From: Amir Blum Date: Sat, 8 Feb 2025 17:24:40 +0200 Subject: [PATCH 15/30] refactor: migrate otel resource env to distro (#2407) This PR migrate the code in webhook that injects OTEL_RESOURCE_ATTRIBUTE and OTEL_SERVICE_NAME to the 3 relevant distributions. It moves code from the main pods_webhook.go file to internal files for better organization Co-authored-by: Ben Elferink --- distros/distro/oteldistribution.go | 20 ++- distros/yamls/dotnet-community.yaml | 6 +- distros/yamls/dotnet-legacy.yaml | 6 +- distros/yamls/java-community.yaml | 6 +- distros/yamls/java-ebpf-instrumentations.yaml | 5 +- distros/yamls/java-enterprise.yaml | 5 +- distros/yamls/nodejs-community.yaml | 5 +- distros/yamls/nodejs-enterprise.yaml | 5 +- distros/yamls/python-community.yaml | 6 +- distros/yamls/python-enterprise.yaml | 7 +- .../controllers/agentenabled/pods_webhook.go | 133 +++--------------- .../agentenabled/podswebhook/env.go | 16 +-- .../agentenabled/podswebhook/otelresource.go | 68 +++++++++ 13 files changed, 141 insertions(+), 147 deletions(-) create mode 100644 instrumentor/controllers/agentenabled/podswebhook/otelresource.go diff --git a/distros/distro/oteldistribution.go b/distros/distro/oteldistribution.go index 9186b7a80a..041c1f6d4e 100644 --- a/distros/distro/oteldistribution.go +++ b/distros/distro/oteldistribution.go @@ -40,11 +40,18 @@ type EnvironmentVariable struct { Delimiter string `yaml:"delimiter"` } -type AgentDirectory struct { +type RuntimeAgent struct { // The name of a directory where odigos agent files can be found. // The special value {{ODIGOS_AGENTS_DIR}} is replaced with the actual value at this platform. - // K8s will mount this directory from the node fs to the container, but other platforms may have different ways for handling this. - DirectoryName string `yaml:"directoryName"` + // K8s will mount this directory from the node fs to the container. other platforms may have different ways to make the directory accessible. + DirectoryNames []string `yaml:"directoryNames"` + + // This field indicates that the agent populates k8s resource attributes via environment variables. + // It targets distros odigos uses without wrapper or customization. + // For eBPF, the resource attributes are set in code. + // For opamp distros, the resource attributes are set in the opamp server. + // We will eventually remove this field once all distros upgrade to dynamic resource attributes. + K8sAttrsViaEnvVars bool `yaml:"k8sAttrsViaEnvVars,omitempty"` } // OtelDistro (Short for OpenTelemetry Distribution) is a collection of OpenTelemetry components, @@ -88,8 +95,7 @@ type OtelDistro struct { // to enable the distribution. EnvironmentVariables []EnvironmentVariable `yaml:"environmentVariables,omitempty"` - // Directories on the FS where the agent files can be consumed from. - // this can be empty if the distribution does not require agent files, - // or contain more than one directory if the distribution requires it. - AgentDirectories []AgentDirectory `yaml:"agentDirectories,omitempty"` + // Metadata and properties of the runtime agent that is used to enable the distribution. + // Can be nil in case no runtime agent is required. + RuntimeAgent *RuntimeAgent `yaml:"runtimeAgent,omitempty"` } diff --git a/distros/yamls/dotnet-community.yaml b/distros/yamls/dotnet-community.yaml index 0e43fe486f..04bbcf0288 100644 --- a/distros/yamls/dotnet-community.yaml +++ b/distros/yamls/dotnet-community.yaml @@ -19,5 +19,7 @@ spec: tiers: - community - onprem - agentDirectories: - - directoryName: "{{ODIGOS_AGENTS_DIR}}/dotnet" + runtimeAgent: + directoryNames: + - "{{ODIGOS_AGENTS_DIR}}/dotnet" + k8sAttrsViaEnvVars: true diff --git a/distros/yamls/dotnet-legacy.yaml b/distros/yamls/dotnet-legacy.yaml index 561aafa052..e95fbb8b51 100644 --- a/distros/yamls/dotnet-legacy.yaml +++ b/distros/yamls/dotnet-legacy.yaml @@ -13,5 +13,7 @@ spec: This distribution is for Dotnet applications running on old runtimes, using OpenTelemetry Native SDK and instrumentation libraries from the OpenTelemetry community. tiers: - onprem - agentDirectories: - - directoryName: "{{ODIGOS_AGENTS_DIR}}/legacy-dotnet" + runtimeAgent: + directoryNames: + - "{{ODIGOS_AGENTS_DIR}}/legacy-dotnet" + k8sAttrsViaEnvVars: true diff --git a/distros/yamls/java-community.yaml b/distros/yamls/java-community.yaml index 8ae6392005..27a6f752d6 100644 --- a/distros/yamls/java-community.yaml +++ b/distros/yamls/java-community.yaml @@ -20,5 +20,7 @@ spec: - envName: JAVA_TOOL_OPTIONS envValue: '-javaagent:{{ODIGOS_AGENTS_DIR}}/java/javaagent.jar' delimiter: ' ' - agentDirectories: - - directoryName: "{{ODIGOS_AGENTS_DIR}}/java" + runtimeAgent: + directoryNames: + - "{{ODIGOS_AGENTS_DIR}}/java" + k8sAttrsViaEnvVars: true diff --git a/distros/yamls/java-ebpf-instrumentations.yaml b/distros/yamls/java-ebpf-instrumentations.yaml index eb4bef7783..4c7241ab79 100644 --- a/distros/yamls/java-ebpf-instrumentations.yaml +++ b/distros/yamls/java-ebpf-instrumentations.yaml @@ -20,5 +20,6 @@ spec: - envName: JAVA_TOOL_OPTIONS envValue: '-javaagent:{{ODIGOS_AGENTS_DIR}}/java-ebpf/dtrace-injector.jar' delimiter: ' ' - agentDirectories: - - directoryName: "{{ODIGOS_AGENTS_DIR}}/java-ebpf" + runtimeAgent: + directoryNames: + - "{{ODIGOS_AGENTS_DIR}}/java-ebpf" diff --git a/distros/yamls/java-enterprise.yaml b/distros/yamls/java-enterprise.yaml index 59de21986a..129aca1de6 100644 --- a/distros/yamls/java-enterprise.yaml +++ b/distros/yamls/java-enterprise.yaml @@ -20,5 +20,6 @@ spec: - envName: JAVA_TOOL_OPTIONS envValue: "-javaagent:{{ODIGOS_AGENTS_DIR}}/java-ext-ebpf/javaagent.jar -Dotel.javaagent.extensions={{ODIGOS_AGENTS_DIR}}/java-ext-ebpf/otel_agent_extension.jar" delimiter: ' ' - agentDirectories: - - directoryName: "{{ODIGOS_AGENTS_DIR}}/java-ext-ebpf" + runtimeAgent: + directoryNames: + - "{{ODIGOS_AGENTS_DIR}}/java-ext-ebpf" diff --git a/distros/yamls/nodejs-community.yaml b/distros/yamls/nodejs-community.yaml index 60f26cb5fc..2ad3fc79da 100644 --- a/distros/yamls/nodejs-community.yaml +++ b/distros/yamls/nodejs-community.yaml @@ -17,5 +17,6 @@ spec: - envName: NODE_OPTIONS envValue: '--require {{ODIGOS_AGENTS_DIR}}/nodejs/autoinstrumentation.js' delimiter: ' ' - agentDirectories: - - directoryName: "{{ODIGOS_AGENTS_DIR}}/nodejs" + runtimeAgent: + directoryNames: + - "{{ODIGOS_AGENTS_DIR}}/nodejs" diff --git a/distros/yamls/nodejs-enterprise.yaml b/distros/yamls/nodejs-enterprise.yaml index e5d474088f..d7d929cee3 100644 --- a/distros/yamls/nodejs-enterprise.yaml +++ b/distros/yamls/nodejs-enterprise.yaml @@ -17,5 +17,6 @@ spec: - envName: NODE_OPTIONS envValue: '--require {{ODIGOS_AGENTS_DIR}}/nodejs-ebpf/autoinstrumentation.js' delimiter: ' ' - agentDirectories: - - directoryName: "{{ODIGOS_AGENTS_DIR}}/nodejs-ebpf" + runtimeAgent: + directoryNames: + - "{{ODIGOS_AGENTS_DIR}}/nodejs-ebpf" diff --git a/distros/yamls/python-community.yaml b/distros/yamls/python-community.yaml index ac96da44dc..251e61d3e5 100644 --- a/distros/yamls/python-community.yaml +++ b/distros/yamls/python-community.yaml @@ -17,5 +17,7 @@ spec: - envName: PYTHONPATH envValue: '{{ODIGOS_AGENTS_DIR}}/python:{{ODIGOS_AGENTS_DIR}}/python/opentelemetry/instrumentation/auto_instrumentation' delimiter: ':' - agentDirectories: - - directoryName: "{{ODIGOS_AGENTS_DIR}}/python" + runtimeAgent: + directoryNames: + - "{{ODIGOS_AGENTS_DIR}}/python" + \ No newline at end of file diff --git a/distros/yamls/python-enterprise.yaml b/distros/yamls/python-enterprise.yaml index cb6532a852..23bff0736c 100644 --- a/distros/yamls/python-enterprise.yaml +++ b/distros/yamls/python-enterprise.yaml @@ -17,6 +17,7 @@ spec: - envName: PYTHONPATH envValue: '{{ODIGOS_AGENTS_DIR}}/python-ebpf:{{ODIGOS_AGENTS_DIR}}/python/opentelemetry/instrumentation/auto_instrumentation:{{ODIGOS_AGENTS_DIR}}/python' delimiter: ':' - agentDirectories: - - directoryName: "{{ODIGOS_AGENTS_DIR}}/python-ebpf" - - directoryName: "{{ODIGOS_AGENTS_DIR}}/python" + runtimeAgent: + directoryNames: + - "{{ODIGOS_AGENTS_DIR}}/python" + - "{{ODIGOS_AGENTS_DIR}}/python-ebpf" diff --git a/instrumentor/controllers/agentenabled/pods_webhook.go b/instrumentor/controllers/agentenabled/pods_webhook.go index 4b93ec7424..fff4787d57 100644 --- a/instrumentor/controllers/agentenabled/pods_webhook.go +++ b/instrumentor/controllers/agentenabled/pods_webhook.go @@ -4,7 +4,6 @@ import ( "context" "errors" "fmt" - "strings" "github.com/go-logr/logr" "github.com/odigos-io/odigos/api/k8sconsts" @@ -19,8 +18,6 @@ import ( "github.com/odigos-io/odigos/instrumentor/sdks" sourceutils "github.com/odigos-io/odigos/k8sutils/pkg/source" "github.com/odigos-io/odigos/k8sutils/pkg/workload" - "go.opentelemetry.io/otel/attribute" - semconv "go.opentelemetry.io/otel/semconv/v1.26.0" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" @@ -30,14 +27,6 @@ import ( "sigs.k8s.io/controller-runtime/pkg/webhook/admission" ) -const otelServiceNameEnvVarName = "OTEL_SERVICE_NAME" -const otelResourceAttributesEnvVarName = "OTEL_RESOURCE_ATTRIBUTES" - -type resourceAttribute struct { - Key attribute.Key - Value string -} - type PodsWebhook struct { client.Client } @@ -80,6 +69,13 @@ func (p *PodsWebhook) Default(ctx context.Context, obj runtime.Object) error { return nil } + // this is temporary and should be refactored so the service name and other resource attributes are written to agent config + serviceName := p.getServiceNameForEnv(ctx, logger, pw) + if serviceName == nil || *serviceName == "" { + logger.Error(errors.New("failed to get service name for pod"), "Skipping Injection of ODIGOS agent") + return nil + } + // Add odiglet installed node-affinity to the pod podutils.AddOdigletInstalledAffinity(pod) @@ -97,7 +93,7 @@ func (p *PodsWebhook) Default(ctx context.Context, obj runtime.Object) error { continue } - containerVolumeMounted, err := injectOdigosToContainer(containerConfig, podContainerSpec, *pw) + containerVolumeMounted, err := injectOdigosToContainer(containerConfig, podContainerSpec, *pw, *serviceName) if err != nil { logger.Error(err, "failed to inject ODIGOS agent to container") continue @@ -159,9 +155,6 @@ func (p *PodsWebhook) injectOdigosInstrumentation(ctx context.Context, pod *core return fmt.Errorf("failed to determine OpenTelemetry SDKs: %w", err) } - var serviceName *string - var serviceNameEnv *corev1.EnvVar - for i := range pod.Spec.Containers { container := &pod.Spec.Containers[i] runtimeDetails := ic.Status.GetRuntimeDetailsForContainer(*container) @@ -189,37 +182,11 @@ func (p *PodsWebhook) injectOdigosInstrumentation(ctx context.Context, pod *core } webhookenvinjector.InjectOdigosAgentEnvVars(logger, *pw, container, otelSdk, runtimeDetails) - - if shouldInjectServiceName(runtimeDetails.Language, otelSdk) { - // Ensure the serviceName is fetched only once per pod - if serviceName == nil { - serviceName = p.getServiceNameForEnv(ctx, logger, pw) - } - // Initialize serviceNameEnv only once per pod if serviceName is valid - if serviceName != nil && serviceNameEnv == nil { - serviceNameEnv = &corev1.EnvVar{ - Name: otelServiceNameEnvVarName, - Value: *serviceName, - } - } - - if !otelNameExists(container.Env) { - container.Env = append(container.Env, *serviceNameEnv) - } - } - - resourceAttributes := getResourceAttributes(pw, container.Name) - resourceAttributesEnvValue := getResourceAttributesEnvVarValue(resourceAttributes) - - container.Env = append(container.Env, corev1.EnvVar{ - Name: otelResourceAttributesEnvVarName, - Value: resourceAttributesEnvValue, - }) } return nil } -func injectOdigosToContainer(containerConfig *odigosv1.ContainerAgentConfig, podContainerSpec *corev1.Container, pw k8sconsts.PodWorkload) (bool, error) { +func injectOdigosToContainer(containerConfig *odigosv1.ContainerAgentConfig, podContainerSpec *corev1.Container, pw k8sconsts.PodWorkload, serviceName string) (bool, error) { distroName := containerConfig.OtelDistroName @@ -228,79 +195,25 @@ func injectOdigosToContainer(containerConfig *odigosv1.ContainerAgentConfig, pod return false, fmt.Errorf("distribution %s not found", distroName) } - volumeMounted := false - for _, agentDirectory := range distroMetadata.AgentDirectories { - podswebhook.MountDirectory(podContainerSpec, agentDirectory.DirectoryName) - volumeMounted = true - } - podswebhook.InjectOdigosK8sEnvVars(podContainerSpec, distroName, pw.Namespace) - - return volumeMounted, nil -} - -func getWorkloadKindAttributeKey(podWorkload *k8sconsts.PodWorkload) attribute.Key { - switch podWorkload.Kind { - case k8sconsts.WorkloadKindDeployment: - return semconv.K8SDeploymentNameKey - case k8sconsts.WorkloadKindStatefulSet: - return semconv.K8SStatefulSetNameKey - case k8sconsts.WorkloadKindDaemonSet: - return semconv.K8SDaemonSetNameKey - } - return attribute.Key("") -} - -func getResourceAttributes(podWorkload *k8sconsts.PodWorkload, containerName string) []resourceAttribute { - if podWorkload == nil { - return []resourceAttribute{} - } - - workloadKindKey := getWorkloadKindAttributeKey(podWorkload) - return []resourceAttribute{ - { - Key: semconv.K8SContainerNameKey, - Value: containerName, - }, - { - Key: semconv.K8SNamespaceNameKey, - Value: podWorkload.Namespace, - }, - { - Key: workloadKindKey, - Value: podWorkload.Name, - }, - } -} - -func getResourceAttributesEnvVarValue(ra []resourceAttribute) string { - var attrs []string - for _, a := range ra { - attrs = append(attrs, fmt.Sprintf("%s=%s", a.Key, a.Value)) + // check for existing env vars so we don't introduce them again + existingEnvNames := make(map[string]struct{}) + for _, envVar := range podContainerSpec.Env { + existingEnvNames[envVar.Name] = struct{}{} } - return strings.Join(attrs, ",") -} -func otelNameExists(containerEnv []corev1.EnvVar) bool { - for _, envVar := range containerEnv { - if envVar.Name == otelServiceNameEnvVarName { - return true + volumeMounted := false + if distroMetadata.RuntimeAgent != nil { + for _, agentDirectoryName := range distroMetadata.RuntimeAgent.DirectoryNames { + podswebhook.MountDirectory(podContainerSpec, agentDirectoryName) + volumeMounted = true + } + if distroMetadata.RuntimeAgent.K8sAttrsViaEnvVars { + podswebhook.InjectOtelResourceAndServerNameEnvVars(&existingEnvNames, podContainerSpec, distroName, pw, serviceName) } } - return false -} + podswebhook.InjectOdigosK8sEnvVars(&existingEnvNames, podContainerSpec, distroName, pw.Namespace) -// this is used to set the OTEL_SERVICE_NAME for programming languages and otel sdks that requires it. -// eBPF instrumentations sets the service name in code, thus it's not needed here. -// OpAMP sends the service name in the protocol, thus it's not needed here. -// We are only left with OSS Java and Dotnet that requires the OTEL_SERVICE_NAME to be set. -func shouldInjectServiceName(pl common.ProgrammingLanguage, otelsdk common.OtelSdk) bool { - if pl == common.DotNetProgrammingLanguage { - return true - } - if pl == common.JavaProgrammingLanguage && otelsdk.SdkTier == common.CommunityOtelSdkTier { - return true - } - return false + return volumeMounted, nil } // checks for the service name on the annotation, or fallback to the workload name diff --git a/instrumentor/controllers/agentenabled/podswebhook/env.go b/instrumentor/controllers/agentenabled/podswebhook/env.go index a1b88d59c7..a798151f6f 100644 --- a/instrumentor/controllers/agentenabled/podswebhook/env.go +++ b/instrumentor/controllers/agentenabled/podswebhook/env.go @@ -5,18 +5,12 @@ import ( corev1 "k8s.io/api/core/v1" ) -func InjectOdigosK8sEnvVars(container *corev1.Container, distroName string, ns string) { +func InjectOdigosK8sEnvVars(existingEnvNames *map[string]struct{}, container *corev1.Container, distroName string, ns string) { - // check for existing env vars so we don't introduce them again - existingEnvNames := make(map[string]struct{}) - for _, envVar := range container.Env { - existingEnvNames[envVar.Name] = struct{}{} - } - - injectEnvVarToPodContainer(&existingEnvNames, container, k8sconsts.OdigosEnvVarContainerName, container.Name) - injectEnvVarToPodContainer(&existingEnvNames, container, k8sconsts.OdigosEnvVarDistroName, distroName) - injectEnvVarObjectFieldRefToPodContainer(&existingEnvNames, container, k8sconsts.OdigosEnvVarPodName, "metadata.name") - injectEnvVarToPodContainer(&existingEnvNames, container, k8sconsts.OdigosEnvVarNamespace, ns) + injectEnvVarToPodContainer(existingEnvNames, container, k8sconsts.OdigosEnvVarContainerName, container.Name) + injectEnvVarToPodContainer(existingEnvNames, container, k8sconsts.OdigosEnvVarDistroName, distroName) + injectEnvVarObjectFieldRefToPodContainer(existingEnvNames, container, k8sconsts.OdigosEnvVarPodName, "metadata.name") + injectEnvVarToPodContainer(existingEnvNames, container, k8sconsts.OdigosEnvVarNamespace, ns) } func injectEnvVarObjectFieldRefToPodContainer(existingEnvNames *map[string]struct{}, container *corev1.Container, envVarName, envVarRef string) { diff --git a/instrumentor/controllers/agentenabled/podswebhook/otelresource.go b/instrumentor/controllers/agentenabled/podswebhook/otelresource.go new file mode 100644 index 0000000000..7fe1da0897 --- /dev/null +++ b/instrumentor/controllers/agentenabled/podswebhook/otelresource.go @@ -0,0 +1,68 @@ +package podswebhook + +import ( + "fmt" + "strings" + + "github.com/odigos-io/odigos/api/k8sconsts" + "go.opentelemetry.io/otel/attribute" + semconv "go.opentelemetry.io/otel/semconv/v1.26.0" + corev1 "k8s.io/api/core/v1" +) + +const otelServiceNameEnvVarName = "OTEL_SERVICE_NAME" +const otelResourceAttributesEnvVarName = "OTEL_RESOURCE_ATTRIBUTES" + +type resourceAttribute struct { + Key attribute.Key + Value string +} + +func getResourceAttributes(podWorkload k8sconsts.PodWorkload, containerName string) []resourceAttribute { + workloadKindKey := getWorkloadKindAttributeKey(podWorkload.Kind) + return []resourceAttribute{ + { + Key: semconv.K8SContainerNameKey, + Value: containerName, + }, + { + Key: semconv.K8SNamespaceNameKey, + Value: podWorkload.Namespace, + }, + { + Key: workloadKindKey, + Value: podWorkload.Name, + }, + } +} + +func getWorkloadKindAttributeKey(workloadKind k8sconsts.WorkloadKind) attribute.Key { + switch workloadKind { + case k8sconsts.WorkloadKindDeployment: + return semconv.K8SDeploymentNameKey + case k8sconsts.WorkloadKindStatefulSet: + return semconv.K8SStatefulSetNameKey + case k8sconsts.WorkloadKindDaemonSet: + return semconv.K8SDaemonSetNameKey + } + return attribute.Key("") +} + +func getResourceAttributesEnvVarValue(ra []resourceAttribute) string { + var attrs []string + for _, a := range ra { + attrs = append(attrs, fmt.Sprintf("%s=%s", a.Key, a.Value)) + } + return strings.Join(attrs, ",") +} + +func InjectOtelResourceAndServerNameEnvVars(existingEnvNames *map[string]struct{}, container *corev1.Container, distroName string, pw k8sconsts.PodWorkload, serviceName string) { + + // OTEL_SERVICE_NAME + injectEnvVarToPodContainer(existingEnvNames, container, otelServiceNameEnvVarName, serviceName) + + // OTEL_RESOURCE_ATTRIBUTES + resourceAttributes := getResourceAttributes(pw, container.Name) + resourceAttributesEnvValue := getResourceAttributesEnvVarValue(resourceAttributes) + injectEnvVarToPodContainer(existingEnvNames, container, otelResourceAttributesEnvVarName, resourceAttributesEnvValue) +} From 09fceb42a284b0c5ef479be5ab7a81c65fc9e614 Mon Sep 17 00:00:00 2001 From: Amir Blum Date: Sat, 8 Feb 2025 22:32:59 +0200 Subject: [PATCH 16/30] fix: recreate autoscaler resources if deleted or modified (#2409) If for any reason, the data-collection daemonset, gateway deployment, or one of the config maps is deleted, then it's not re-created at the moment. This PR makes it so they are. We had a bug where the collectors group would get deleted, and it also deleted the daemonset. then if the collectors group is re-created immediately, the daemonset would stay deleted and odigos would not work --- autoscaler/controllers/collectorsgroup_controller.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/autoscaler/controllers/collectorsgroup_controller.go b/autoscaler/controllers/collectorsgroup_controller.go index 35ee06406a..cab9d24a0f 100644 --- a/autoscaler/controllers/collectorsgroup_controller.go +++ b/autoscaler/controllers/collectorsgroup_controller.go @@ -26,6 +26,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" + appsv1 "k8s.io/api/apps/v1" + corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/version" ctrl "sigs.k8s.io/controller-runtime" @@ -61,6 +63,9 @@ func (r *CollectorsGroupReconciler) Reconcile(ctx context.Context, req ctrl.Requ func (r *CollectorsGroupReconciler) SetupWithManager(mgr ctrl.Manager) error { return ctrl.NewControllerManagedBy(mgr). For(&odigosv1.CollectorsGroup{}). + Owns(&appsv1.DaemonSet{}). // in case the ds is deleted or modified for any reason, this will reconcile and recreate it + Owns(&appsv1.Deployment{}). // in case the deployment is deleted or modified for any reason, this will reconcile and recreate it + Owns(&corev1.ConfigMap{}). // in case the configmap is deleted or modified for any reason, this will reconcile and recreate it // we assume everything in the collectorsgroup spec is the configuration for the collectors to generate. // thus, we need to monitor any change to the spec which is what the generation field is for. WithEventFilter(&predicate.GenerationChangedPredicate{}). From 8547db058b319ef198ea4127a69d21998e48feeb Mon Sep 17 00:00:00 2001 From: Eden Federman Date: Sun, 9 Feb 2025 13:25:42 +0200 Subject: [PATCH 17/30] Change odiglet base image to distroless (#2400) Co-authored-by: Ron Federman <73110295+RonFed@users.noreply.github.com> --- odiglet/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/odiglet/Dockerfile b/odiglet/Dockerfile index ff8ec9faca..8f1ea4ecf2 100644 --- a/odiglet/Dockerfile +++ b/odiglet/Dockerfile @@ -118,7 +118,7 @@ COPY --from=nodejs-agent-native-community-builder /repos/odigos/agents/nodejs-na # .NET COPY --from=dotnet-builder /dotnet-instrumentation /instrumentations/dotnet -FROM registry.fedoraproject.org/fedora-minimal:38 +FROM gcr.io/distroless/base:latest COPY --from=builder /go/src/github.com/odigos-io/odigos/odiglet/odiglet /root/odiglet WORKDIR /instrumentations/ COPY --from=builder /instrumentations/ . From 86369ded734a8724e9fe434d6c4bbfb1c6fa9d7c Mon Sep 17 00:00:00 2001 From: Ron Federman <73110295+RonFed@users.noreply.github.com> Date: Sun, 9 Feb 2025 15:14:17 +0200 Subject: [PATCH 18/30] combine status updates of instrumentation configs (#2412) --- .../agentenabled/rollout/rollout.go | 27 +++++++++---------- instrumentor/controllers/agentenabled/sync.go | 19 ++++++------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/instrumentor/controllers/agentenabled/rollout/rollout.go b/instrumentor/controllers/agentenabled/rollout/rollout.go index b2dc29044b..5d1b41b437 100644 --- a/instrumentor/controllers/agentenabled/rollout/rollout.go +++ b/instrumentor/controllers/agentenabled/rollout/rollout.go @@ -10,7 +10,6 @@ import ( "github.com/odigos-io/odigos/api/k8sconsts" odigosv1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1" "github.com/odigos-io/odigos/k8sutils/pkg/conditions" - "github.com/odigos-io/odigos/k8sutils/pkg/utils" "github.com/odigos-io/odigos/k8sutils/pkg/workload" appsv1 "k8s.io/api/apps/v1" "k8s.io/apimachinery/pkg/api/meta" @@ -31,12 +30,14 @@ const requeueWaitingForWorkloadRollout = 10 * time.Second // // If a rollout is triggered the status of the instrumentation config is updated with the new rollout hash // and a corresponding condition is set. -func Do(ctx context.Context, c client.Client, ic *odigosv1alpha1.InstrumentationConfig, pw k8sconsts.PodWorkload) (ctrl.Result, error) { +// +// Returns a boolean indicating if the status of the instrumentation config has changed, a ctrl.Result and an error. +func Do(ctx context.Context, c client.Client, ic *odigosv1alpha1.InstrumentationConfig, pw k8sconsts.PodWorkload) (bool, ctrl.Result, error) { logger := log.FromContext(ctx) workloadObj := workload.ClientObjectFromWorkloadKind(pw.Kind) err := c.Get(ctx, client.ObjectKey{Name: pw.Name, Namespace: pw.Namespace}, workloadObj) if err != nil { - return ctrl.Result{}, client.IgnoreNotFound(err) + return false, ctrl.Result{}, client.IgnoreNotFound(err) } if ic == nil { @@ -44,33 +45,30 @@ func Do(ctx context.Context, c client.Client, ic *odigosv1alpha1.Instrumentation // this should happen once per workload, as the instrumentation config is deleted // and we want to rollout the workload to remove the instrumentation rolloutErr := rolloutRestartWorkload(ctx, workloadObj, c, time.Now()) - return ctrl.Result{}, client.IgnoreNotFound(rolloutErr) + return false, ctrl.Result{}, client.IgnoreNotFound(rolloutErr) } savedRolloutHash := ic.Status.WorkloadRolloutHash newRolloutHash, err := configHash(ic) if err != nil { logger.Error(err, "error calculating rollout hash") - return ctrl.Result{}, nil + return false, ctrl.Result{}, nil } if savedRolloutHash == newRolloutHash { - return ctrl.Result{}, nil + return false, ctrl.Result{}, nil } // if a rollout is ongoing, wait for it to finish, requeue + statusChanged := false if !isWorkloadRolloutDone(workloadObj) { - meta.SetStatusCondition(&ic.Status.Conditions, metav1.Condition{ + statusChanged = meta.SetStatusCondition(&ic.Status.Conditions, metav1.Condition{ Type: odigosv1alpha1.WorkloadRolloutStatusConditionType, Status: metav1.ConditionFalse, Reason: string(odigosv1alpha1.WorkloadRolloutReasonPreviousRolloutOngoing), Message: "waiting for workload rollout to finish before triggering a new one", }) - err = c.Status().Update(ctx, ic) - if err != nil { - logger.Error(err, "error updating instrumentation config status") - } - return ctrl.Result{RequeueAfter: requeueWaitingForWorkloadRollout}, nil + return statusChanged, ctrl.Result{RequeueAfter: requeueWaitingForWorkloadRollout}, nil } rolloutErr := rolloutRestartWorkload(ctx, workloadObj, c, time.Now()) @@ -80,8 +78,9 @@ func Do(ctx context.Context, c client.Client, ic *odigosv1alpha1.Instrumentation ic.Status.WorkloadRolloutHash = newRolloutHash meta.SetStatusCondition(&ic.Status.Conditions, rolloutCondition(rolloutErr)) - err = c.Status().Update(ctx, ic) - return utils.K8SUpdateErrorHandler(err) + + // at this point, the hashes are different, notify the caller the status has changed + return true, ctrl.Result{}, nil } // RolloutRestartWorkload restarts the given workload by patching its template annotations. diff --git a/instrumentor/controllers/agentenabled/sync.go b/instrumentor/controllers/agentenabled/sync.go index 5eee3546ac..baa4c5e952 100644 --- a/instrumentor/controllers/agentenabled/sync.go +++ b/instrumentor/controllers/agentenabled/sync.go @@ -2,6 +2,7 @@ package agentenabled import ( "context" + "errors" "fmt" "github.com/hashicorp/go-version" @@ -56,7 +57,6 @@ func reconcileAll(ctx context.Context, c client.Client) (ctrl.Result, error) { } func reconcileWorkload(ctx context.Context, c client.Client, icName string, namespace string) (ctrl.Result, error) { - logger := log.FromContext(ctx) workloadName, workloadKind, err := workload.ExtractWorkloadInfoFromRuntimeObjectName(icName) @@ -76,7 +76,8 @@ func reconcileWorkload(ctx context.Context, c client.Client, icName string, name if apierrors.IsNotFound(err) { // instrumentation config is deleted, trigger a rollout for the associated workload // this should happen once per workload, as the instrumentation config is deleted - return rollout.Do(ctx, c, nil, pw) + _, res, err := rollout.Do(ctx, c, nil, pw) + return res, err } return ctrl.Result{}, err } @@ -100,15 +101,15 @@ func reconcileWorkload(ctx context.Context, c client.Client, icName string, name Message: condition.Message, } - changed := meta.SetStatusCondition(&ic.Status.Conditions, cond) - if changed { - err = c.Status().Update(ctx, &ic) - if err != nil { - return utils.K8SUpdateErrorHandler(err) - } + agentEnabledChanged := meta.SetStatusCondition(&ic.Status.Conditions, cond) + rolloutChanged, res, err := rollout.Do(ctx, c, &ic, pw) + + if rolloutChanged || agentEnabledChanged { + updateErr := c.Status().Update(ctx, &ic) + err = errors.Join(err, updateErr) } - return rollout.Do(ctx, c, &ic, pw) + return res, err } // this function receives a workload object, and updates the instrumentation config object ptr. From c3c9f2d0b2252fa63a2a791af2284b50c499a054 Mon Sep 17 00:00:00 2001 From: Amir Blum Date: Sun, 9 Feb 2025 15:55:26 +0200 Subject: [PATCH 19/30] feat: add a status condition to ic for instrumentation details (#2408) This adds a condition that describes why the workload is instrumented (which kind of source), along with it's name for better troubleshooting and traceability. Examples: ![image](https://github.com/user-attachments/assets/16193fc3-3f95-4a5c-aa9b-1ab4572035b4) The function in k8sutils now returns more info about the decision, which can later be used for odigos describe and possibly be also persisted with ic delete if we ever need finalizers for it. --- .../v1alpha1/instrumentationconfig_types.go | 42 +++++++++++ instrumentor/controllers/agentenabled/sync.go | 2 +- .../deleteinstrumentationconfig/common.go | 4 +- .../instrumentationconfig_controller.go | 2 +- .../namespace_controller.go | 2 +- .../source_controller.go | 2 +- .../controllers/startlangdetection/common.go | 63 +++++++++++----- .../startlangdetection/conditionutils.go | 30 ++++++++ .../namespace_controller.go | 4 +- .../startlangdetection/source_controller.go | 14 +++- .../workload_controllers.go | 59 ++++++++++++--- k8sutils/pkg/source/source.go | 43 +++++++---- .../01-assert-instrumented.yaml | 72 +++++++++++++++++++ 13 files changed, 288 insertions(+), 51 deletions(-) create mode 100644 instrumentor/controllers/startlangdetection/conditionutils.go diff --git a/api/odigos/v1alpha1/instrumentationconfig_types.go b/api/odigos/v1alpha1/instrumentationconfig_types.go index ee1d15bd82..7b7cc99ac8 100644 --- a/api/odigos/v1alpha1/instrumentationconfig_types.go +++ b/api/odigos/v1alpha1/instrumentationconfig_types.go @@ -22,6 +22,10 @@ type InstrumentationConfig struct { // conditions for the InstrumentationConfigStatus const ( + // Define a status condition type that describes why the workload is marked for instrumentation or not. + MarkedForInstrumentationStatusConditionType = "MarkedForInstrumentation" + // Describe the runtime detection status of this workload. + RuntimeDetectionStatusConditionType = "RuntimeDetection" // TODO: placeholder, not yet implemented // this const is the Type field in the conditions of the InstrumentationConfigStatus. AgentEnabledStatusConditionType = "AgentEnabled" // reports whether the workload associated with the InstrumentationConfig has been rolled out. @@ -29,6 +33,44 @@ const ( WorkloadRolloutStatusConditionType = "WorkloadRollout" ) +func StatusConditionTypeLogicalOrder(condType string) int { + switch condType { + case MarkedForInstrumentationStatusConditionType: + return 1 + case RuntimeDetectionStatusConditionType: + // TODO: placeholder, not yet implemented + return 2 + case AgentEnabledStatusConditionType: + return 3 + case WorkloadRolloutStatusConditionType: + return 4 + default: + return 5 + } +} + +// +kubebuilder:validation:Enum=WorkloadSource;NamespaceSource;WorkloadSourceDisabled;NoSource;RetirableError +type MarkedForInstrumentationReason string + +const ( + // denotes that the workload is instrumented because of a source CR exists for this workload. + // and the source is not disabled.. + MarkedForInstrumentationReasonWorkloadSource MarkedForInstrumentationReason = "WorkloadSource" + + // denotes that the workload does not have a source CR, but the namespace has a source CR, + // so the workload is instrumented as inherited from the namespace. + MarkedForInstrumentationReasonNamespaceSource MarkedForInstrumentationReason = "NamespaceSource" + + // the source object for workload exists, and it is disabled, thus uninstrumented. + MarkedForInstrumentationReasonWorkloadSourceDisabled MarkedForInstrumentationReason = "WorkloadSourceDisabled" + + // this workload is not instrumented because no source CR exists for it or its namespace. + MarkedForInstrumentationReasonNoSource MarkedForInstrumentationReason = "NoSource" + + // cannot determine the reason for the instrumentation due to a possible transient error. + MarkedForInstrumentationReasonError MarkedForInstrumentationReason = "RetirableError" +) + // +kubebuilder:validation:Enum=EnabledSuccessfully;WaitingForRuntimeInspection;WaitingForNodeCollector;UnsupportedProgrammingLanguage;IgnoredContainer;NoAvailableAgent;UnsupportedRuntimeVersion;MissingDistroParameter;OtherAgentDetected type AgentEnabledReason string diff --git a/instrumentor/controllers/agentenabled/sync.go b/instrumentor/controllers/agentenabled/sync.go index baa4c5e952..f8a6b4173d 100644 --- a/instrumentor/controllers/agentenabled/sync.go +++ b/instrumentor/controllers/agentenabled/sync.go @@ -82,7 +82,7 @@ func reconcileWorkload(ctx context.Context, c client.Client, icName string, name return ctrl.Result{}, err } - logger.Info("Reconciling workload for InstrumentationConfig object agent enabling", "name", ic.Name, "namespace", ic.Namespace, "instrumentationConfig", ic) + logger.Info("Reconciling workload for InstrumentationConfig object agent enabling", "name", ic.Name, "namespace", ic.Namespace, "instrumentationConfigName", ic.Name) condition, err := updateInstrumentationConfigSpec(ctx, c, pw, &ic) if err != nil { diff --git a/instrumentor/controllers/deleteinstrumentationconfig/common.go b/instrumentor/controllers/deleteinstrumentationconfig/common.go index d9fd5c6219..6d6d10caea 100644 --- a/instrumentor/controllers/deleteinstrumentationconfig/common.go +++ b/instrumentor/controllers/deleteinstrumentationconfig/common.go @@ -22,7 +22,7 @@ import ( func reconcileWorkloadObject(ctx context.Context, kubeClient client.Client, workloadObject client.Object) error { logger := log.FromContext(ctx) - instrumented, err := sourceutils.IsObjectInstrumentedBySource(ctx, kubeClient, workloadObject) + instrumented, _, _, err := sourceutils.IsObjectInstrumentedBySource(ctx, kubeClient, workloadObject) if err != nil { return err } @@ -148,7 +148,7 @@ func syncGenericWorkloadListToNs(ctx context.Context, c client.Client, kind k8sc } } - instrumented, err := sourceutils.IsObjectInstrumentedBySource(ctx, c, freshWorkloadCopy) + instrumented, _, _, err := sourceutils.IsObjectInstrumentedBySource(ctx, c, freshWorkloadCopy) if err != nil { return err } diff --git a/instrumentor/controllers/deleteinstrumentationconfig/instrumentationconfig_controller.go b/instrumentor/controllers/deleteinstrumentationconfig/instrumentationconfig_controller.go index 9ef5e78c51..88ed8125b6 100644 --- a/instrumentor/controllers/deleteinstrumentationconfig/instrumentationconfig_controller.go +++ b/instrumentor/controllers/deleteinstrumentationconfig/instrumentationconfig_controller.go @@ -84,7 +84,7 @@ func (r *InstrumentationConfigReconciler) Reconcile(ctx context.Context, req ctr return ctrl.Result{}, err } - enabled, err := sourceutils.IsObjectInstrumentedBySource(ctx, r.Client, workloadObject) + enabled, _, _, err := sourceutils.IsObjectInstrumentedBySource(ctx, r.Client, workloadObject) if err != nil { return ctrl.Result{}, err } diff --git a/instrumentor/controllers/deleteinstrumentationconfig/namespace_controller.go b/instrumentor/controllers/deleteinstrumentationconfig/namespace_controller.go index c146f7bbae..be3c3562d0 100644 --- a/instrumentor/controllers/deleteinstrumentationconfig/namespace_controller.go +++ b/instrumentor/controllers/deleteinstrumentationconfig/namespace_controller.go @@ -44,7 +44,7 @@ func (r *NamespaceReconciler) Reconcile(ctx context.Context, req ctrl.Request) ( return ctrl.Result{}, err } - enabled, err := sourceutils.IsObjectInstrumentedBySource(ctx, r.Client, &ns) + enabled, _, _, err := sourceutils.IsObjectInstrumentedBySource(ctx, r.Client, &ns) if err != nil { return ctrl.Result{}, err } diff --git a/instrumentor/controllers/deleteinstrumentationconfig/source_controller.go b/instrumentor/controllers/deleteinstrumentationconfig/source_controller.go index 3a05f42c30..ad351d36aa 100644 --- a/instrumentor/controllers/deleteinstrumentationconfig/source_controller.go +++ b/instrumentor/controllers/deleteinstrumentationconfig/source_controller.go @@ -115,7 +115,7 @@ func (r *SourceReconciler) syncWorkload(ctx context.Context, source *v1alpha1.So return err } - instrumented, err := sourceutils.IsObjectInstrumentedBySource(ctx, r.Client, obj) + instrumented, _, _, err := sourceutils.IsObjectInstrumentedBySource(ctx, r.Client, obj) if err != nil { return err } diff --git a/instrumentor/controllers/startlangdetection/common.go b/instrumentor/controllers/startlangdetection/common.go index c751e93b08..d8500b4560 100644 --- a/instrumentor/controllers/startlangdetection/common.go +++ b/instrumentor/controllers/startlangdetection/common.go @@ -15,30 +15,33 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" ) -func syncNamespaceWorkloads(ctx context.Context, k8sClient client.Client, runtimeScheme *runtime.Scheme, namespace string) error { - var err error +func syncNamespaceWorkloads(ctx context.Context, k8sClient client.Client, runtimeScheme *runtime.Scheme, namespace string) (ctrl.Result, error) { + collectiveRes := ctrl.Result{} + var errs error for _, kind := range []k8sconsts.WorkloadKind{ k8sconsts.WorkloadKindDaemonSet, k8sconsts.WorkloadKindDeployment, k8sconsts.WorkloadKindStatefulSet, } { - err = errors.Join(err, listAndReconcileWorkloadList(ctx, k8sClient, runtimeScheme, namespace, kind)) + res, err := listAndReconcileWorkloadList(ctx, k8sClient, runtimeScheme, namespace, kind) + errs = errors.Join(errs, err) + collectiveRes = joinCtrlResultToList(res, collectiveRes) } - return err + return collectiveRes, errs } func listAndReconcileWorkloadList(ctx context.Context, k8sClient client.Client, runtimeScheme *runtime.Scheme, namespace string, - kind k8sconsts.WorkloadKind) error { + kind k8sconsts.WorkloadKind) (ctrl.Result, error) { // pre-process existing Sources for specific workloads so we don't have to make a bunch of API calls // This is used to check if a workload already has an explicit Source, so we don't overwrite its InstrumentationConfig sourceList := v1alpha1.SourceList{} err := k8sClient.List(ctx, &sourceList, client.InNamespace(namespace)) if err != nil { - return err + return ctrl.Result{}, err } namespaceKindSources := make(map[k8sconsts.WorkloadKind]map[string]struct{}) for _, s := range sourceList.Items { @@ -52,33 +55,56 @@ func listAndReconcileWorkloadList(ctx context.Context, deps := workload.ClientListObjectFromWorkloadKind(kind) err = k8sClient.List(ctx, deps, client.InNamespace(namespace)) if client.IgnoreNotFound(err) != nil { - return err + return ctrl.Result{}, err } + collectiveRes := ctrl.Result{} switch obj := deps.(type) { case *v1.DeploymentList: for _, dep := range obj.Items { - err = reconcileWorkloadList(ctx, k8sClient, runtimeScheme, ctrl.Request{NamespacedName: client.ObjectKey{Name: dep.Name, Namespace: dep.Namespace}}, kind, namespaceKindSources) + res, err := reconcileWorkloadList(ctx, k8sClient, runtimeScheme, ctrl.Request{NamespacedName: client.ObjectKey{Name: dep.Name, Namespace: dep.Namespace}}, kind, namespaceKindSources) + // make sure we pass any requeue request up the chain to our caller. if err != nil { - return err + return ctrl.Result{}, err } + collectiveRes = joinCtrlResultToList(res, collectiveRes) } case *v1.DaemonSetList: for _, dep := range obj.Items { - err = reconcileWorkloadList(ctx, k8sClient, runtimeScheme, ctrl.Request{NamespacedName: client.ObjectKey{Name: dep.Name, Namespace: dep.Namespace}}, kind, namespaceKindSources) + res, err := reconcileWorkloadList(ctx, k8sClient, runtimeScheme, ctrl.Request{NamespacedName: client.ObjectKey{Name: dep.Name, Namespace: dep.Namespace}}, kind, namespaceKindSources) if err != nil { - return err + return ctrl.Result{}, err } + collectiveRes = joinCtrlResultToList(res, collectiveRes) } case *v1.StatefulSetList: for _, dep := range obj.Items { - err = reconcileWorkloadList(ctx, k8sClient, runtimeScheme, ctrl.Request{NamespacedName: client.ObjectKey{Name: dep.Name, Namespace: dep.Namespace}}, kind, namespaceKindSources) + res, err := reconcileWorkloadList(ctx, k8sClient, runtimeScheme, ctrl.Request{NamespacedName: client.ObjectKey{Name: dep.Name, Namespace: dep.Namespace}}, kind, namespaceKindSources) if err != nil { - return err + return ctrl.Result{}, err } + collectiveRes = joinCtrlResultToList(res, collectiveRes) } } - return nil + return collectiveRes, nil +} + +func joinCtrlResultToList(res ctrl.Result, collectiveRes ctrl.Result) ctrl.Result { + + // if the current res is not for requeue, we simply ignore it for the collectiveRes + if res.IsZero() { + return collectiveRes + } + + // if the collectiveRes is not set it, set it to the current res + if collectiveRes.IsZero() { + return res + } + + // notice - we ignore the requeueAfter value of the res, and only use the requeue value. + + // else, the new res is less meaningful than the collectiveRes, so keep the collectiveRes + return collectiveRes } func reconcileWorkloadList(ctx context.Context, @@ -86,13 +112,16 @@ func reconcileWorkloadList(ctx context.Context, runtimeScheme *runtime.Scheme, req ctrl.Request, kind k8sconsts.WorkloadKind, - namespaceKindSources map[k8sconsts.WorkloadKind]map[string]struct{}) error { + namespaceKindSources map[k8sconsts.WorkloadKind]map[string]struct{}) (ctrl.Result, error) { logger := log.FromContext(ctx) if _, exists := namespaceKindSources[kind][req.Name]; !exists { - _, err := reconcileWorkload(ctx, k8sClient, kind, req, runtimeScheme) + res, err := reconcileWorkload(ctx, k8sClient, kind, req, runtimeScheme) if err != nil { logger.Error(err, "error requesting runtime details from odiglets", "name", req.Name, "namespace", req.Namespace, "kind", kind) } + if !res.IsZero() { + return res, err + } } - return nil + return ctrl.Result{}, nil } diff --git a/instrumentor/controllers/startlangdetection/conditionutils.go b/instrumentor/controllers/startlangdetection/conditionutils.go new file mode 100644 index 0000000000..80c5d6d31f --- /dev/null +++ b/instrumentor/controllers/startlangdetection/conditionutils.go @@ -0,0 +1,30 @@ +package startlangdetection + +import ( + "slices" + + odigosv1 "github.com/odigos-io/odigos/api/odigos/v1alpha1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" +) + +// Checks if the conditions array in the status is currently sorted by logical order +// this can be used to check if sorting is needed. +func areConditionsLogicallySorted(conditions []metav1.Condition) bool { + var lastTypeLogicalOrder int = 0 + for _, condition := range conditions { + currentLogicalOrder := odigosv1.StatusConditionTypeLogicalOrder(condition.Type) + if currentLogicalOrder <= lastTypeLogicalOrder { + return false + } + lastTypeLogicalOrder = currentLogicalOrder + } + return true +} + +// giving the input conditions array, this function will return a new array with the conditions sorted by logical order +func sortIcConditionsByLogicalOrder(conditions []metav1.Condition) []metav1.Condition { + slices.SortFunc(conditions, func(i, j metav1.Condition) int { + return odigosv1.StatusConditionTypeLogicalOrder(i.Type) - odigosv1.StatusConditionTypeLogicalOrder(j.Type) + }) + return conditions +} diff --git a/instrumentor/controllers/startlangdetection/namespace_controller.go b/instrumentor/controllers/startlangdetection/namespace_controller.go index 0f5b5fb4af..c3dea879c1 100644 --- a/instrumentor/controllers/startlangdetection/namespace_controller.go +++ b/instrumentor/controllers/startlangdetection/namespace_controller.go @@ -25,7 +25,7 @@ func (n *NamespacesReconciler) Reconcile(ctx context.Context, request ctrl.Reque return ctrl.Result{}, client.IgnoreNotFound(err) } - enabled, err := sourceutils.IsObjectInstrumentedBySource(ctx, n.Client, &ns) + enabled, _, _, err := sourceutils.IsObjectInstrumentedBySource(ctx, n.Client, &ns) if err != nil { return ctrl.Result{}, err } @@ -34,5 +34,5 @@ func (n *NamespacesReconciler) Reconcile(ctx context.Context, request ctrl.Reque } logger.V(0).Info("Namespace enabled for instrumentation, recalculating runtime details of relevant workloads") - return ctrl.Result{}, syncNamespaceWorkloads(ctx, n.Client, n.Scheme, ns.GetName()) + return syncNamespaceWorkloads(ctx, n.Client, n.Scheme, ns.GetName()) } diff --git a/instrumentor/controllers/startlangdetection/source_controller.go b/instrumentor/controllers/startlangdetection/source_controller.go index 7903c7501f..9277b9531a 100644 --- a/instrumentor/controllers/startlangdetection/source_controller.go +++ b/instrumentor/controllers/startlangdetection/source_controller.go @@ -61,9 +61,15 @@ func (r *SourceReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctr } if source.Spec.Workload.Kind == k8sconsts.WorkloadKindNamespace { - err = errors.Join(err, syncNamespaceWorkloads(ctx, r.Client, r.Scheme, source.Spec.Workload.Name)) + res, reconcileErr := syncNamespaceWorkloads(ctx, r.Client, r.Scheme, source.Spec.Workload.Name) + if reconcileErr != nil { + err = errors.Join(err, reconcileErr) + } + if !res.IsZero() { + return res, err + } } else { - _, reconcileErr := reconcileWorkload(ctx, + res, reconcileErr := reconcileWorkload(ctx, r.Client, source.Spec.Workload.Kind, ctrl.Request{ @@ -76,6 +82,10 @@ func (r *SourceReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctr if reconcileErr != nil { err = errors.Join(err, reconcileErr) } + if !res.IsZero() { + // propagate the requeue result to the caller if there is one + return res, err + } } if client.IgnoreNotFound(err) != nil { diff --git a/instrumentor/controllers/startlangdetection/workload_controllers.go b/instrumentor/controllers/startlangdetection/workload_controllers.go index bdd4daf973..effeb528a3 100644 --- a/instrumentor/controllers/startlangdetection/workload_controllers.go +++ b/instrumentor/controllers/startlangdetection/workload_controllers.go @@ -3,6 +3,7 @@ package startlangdetection import ( "context" + "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" @@ -13,6 +14,7 @@ import ( "github.com/odigos-io/odigos/api/k8sconsts" odigosv1 "github.com/odigos-io/odigos/api/odigos/v1alpha1" sourceutils "github.com/odigos-io/odigos/k8sutils/pkg/source" + k8sutils "github.com/odigos-io/odigos/k8sutils/pkg/utils" "github.com/odigos-io/odigos/k8sutils/pkg/workload" ) @@ -44,6 +46,9 @@ func (r *StatefulSetReconciler) Reconcile(ctx context.Context, req ctrl.Request) } func reconcileWorkload(ctx context.Context, k8sClient client.Client, objKind k8sconsts.WorkloadKind, req ctrl.Request, scheme *runtime.Scheme) (ctrl.Result, error) { + + logger := log.FromContext(ctx) + obj := workload.ClientObjectFromWorkloadKind(objKind) err := getWorkloadObject(ctx, k8sClient, req, obj) if err != nil { @@ -51,7 +56,7 @@ func reconcileWorkload(ctx context.Context, k8sClient client.Client, objKind k8s return ctrl.Result{}, err } - enabled, err := sourceutils.IsObjectInstrumentedBySource(ctx, k8sClient, obj) + enabled, reason, message, err := sourceutils.IsObjectInstrumentedBySource(ctx, k8sClient, obj) if err != nil { return ctrl.Result{}, err } @@ -60,7 +65,41 @@ func reconcileWorkload(ctx context.Context, k8sClient client.Client, objKind k8s } instConfigName := workload.CalculateWorkloadRuntimeObjectName(req.Name, objKind) - err = requestOdigletsToCalculateRuntimeDetails(ctx, k8sClient, instConfigName, req.Namespace, obj, scheme) + ic, err := requestOdigletsToCalculateRuntimeDetails(ctx, k8sClient, instConfigName, req.Namespace, obj, scheme) + if err != nil { + return ctrl.Result{}, err + } + + if ic == nil { + ic = &odigosv1.InstrumentationConfig{} + err = k8sClient.Get(ctx, types.NamespacedName{Name: instConfigName, Namespace: req.Namespace}, ic) + if err != nil { + return ctrl.Result{}, err + } + } + + cond := metav1.Condition{ + Type: odigosv1.MarkedForInstrumentationStatusConditionType, + Status: metav1.ConditionTrue, // if instrumentation config is created, it is always instrumented. + Reason: string(reason), + Message: message, + } + statuschanged := meta.SetStatusCondition(&ic.Status.Conditions, cond) + if statuschanged { + logger.Info("Updating initial instrumentation status condition of InstrumentationConfig", "name", instConfigName, "namespace", req.Namespace) + if !areConditionsLogicallySorted(ic.Status.Conditions) { + // it is possible that by the time we are running this code, the status conditions are updated by another controller + // in this case, we want to make sure that the conditions are sorted in a logical order. + // this case also covers upgrade from previous versions of odigos where some conditions are already present. + ic.Status.Conditions = sortIcConditionsByLogicalOrder(ic.Status.Conditions) + } + err = k8sClient.Status().Update(ctx, ic) + if err != nil { + logger.Info("Failed to update status conditions of InstrumentationConfig", "name", instConfigName, "namespace", req.Namespace) + return k8sutils.K8SUpdateErrorHandler(err) + } + } + return ctrl.Result{}, err } @@ -68,9 +107,9 @@ func getWorkloadObject(ctx context.Context, k8sClient client.Client, req ctrl.Re return k8sClient.Get(ctx, types.NamespacedName{Name: req.Name, Namespace: req.Namespace}, obj) } -func requestOdigletsToCalculateRuntimeDetails(ctx context.Context, k8sClient client.Client, instConfigName string, namespace string, obj client.Object, scheme *runtime.Scheme) error { +func requestOdigletsToCalculateRuntimeDetails(ctx context.Context, k8sClient client.Client, instConfigName string, namespace string, obj client.Object, scheme *runtime.Scheme) (*odigosv1.InstrumentationConfig, error) { logger := log.FromContext(ctx) - instConfig := &odigosv1.InstrumentationConfig{ + instConfig := odigosv1.InstrumentationConfig{ TypeMeta: metav1.TypeMeta{ APIVersion: "odigos.io/v1alpha1", Kind: "InstrumentationConfig", @@ -83,23 +122,23 @@ func requestOdigletsToCalculateRuntimeDetails(ctx context.Context, k8sClient cli serviceName, err := sourceutils.OtelServiceNameBySource(ctx, k8sClient, obj) if err != nil { - return err + return nil, err } if serviceName != "" { instConfig.Spec.ServiceName = serviceName } - if err := ctrl.SetControllerReference(obj, instConfig, scheme); err != nil { + if err := ctrl.SetControllerReference(obj, &instConfig, scheme); err != nil { logger.Error(err, "Failed to set controller reference", "name", instConfigName, "namespace", namespace) - return err + return nil, err } - err = k8sClient.Create(ctx, instConfig) + err = k8sClient.Create(ctx, &instConfig) if err != nil { - return client.IgnoreAlreadyExists(err) + return nil, client.IgnoreAlreadyExists(err) } logger.V(0).Info("Requested calculation of runtime details from odiglets", "name", instConfigName, "namespace", namespace) - return nil + return &instConfig, nil } diff --git a/k8sutils/pkg/source/source.go b/k8sutils/pkg/source/source.go index b00003d3e5..7c46d4a6ed 100644 --- a/k8sutils/pkg/source/source.go +++ b/k8sutils/pkg/source/source.go @@ -2,8 +2,9 @@ package source import ( "context" + "fmt" - "github.com/odigos-io/odigos/api/odigos/v1alpha1" + odigosv1 "github.com/odigos-io/odigos/api/odigos/v1alpha1" k8sutils "github.com/odigos-io/odigos/k8sutils/pkg/utils" "sigs.k8s.io/controller-runtime/pkg/client" @@ -14,27 +15,41 @@ import ( // 2) Is the object instrumentation disabled on the workload Source (overrides namespace instrumentation): false // 3) Is the object actively included by a namespace Source: true // 4) False -func IsObjectInstrumentedBySource(ctx context.Context, k8sClient client.Client, obj client.Object) (bool, error) { +func IsObjectInstrumentedBySource(ctx context.Context, + k8sClient client.Client, + obj client.Object) (bool, odigosv1.MarkedForInstrumentationReason, string, error) { // Check if a Source object exists for this object - sources, err := v1alpha1.GetSources(ctx, k8sClient, obj) + sources, err := odigosv1.GetSources(ctx, k8sClient, obj) if err != nil { - return false, err + reason := odigosv1.MarkedForInstrumentationReasonError + return false, reason, "cannot determine if workload is marked for instrumentation due to error", err } if sources.Workload != nil { - if !v1alpha1.IsDisabledSource(sources.Workload) && !k8sutils.IsTerminating(sources.Workload) { - return true, nil + if !odigosv1.IsDisabledSource(sources.Workload) && !k8sutils.IsTerminating(sources.Workload) { + reason := odigosv1.MarkedForInstrumentationReasonWorkloadSource + message := fmt.Sprintf("workload marked for automatic instrumentation by workload source CR '%s' in namespace '%s'", + sources.Workload.Name, sources.Workload.Namespace) + return true, reason, message, nil } - if v1alpha1.IsDisabledSource(sources.Workload) && !k8sutils.IsTerminating(sources.Workload) { - return false, nil + if odigosv1.IsDisabledSource(sources.Workload) && !k8sutils.IsTerminating(sources.Workload) { + reason := odigosv1.MarkedForInstrumentationReasonWorkloadSourceDisabled + message := fmt.Sprintf("workload marked to disable instrumentation by workload source CR '%s' in namespace '%s'", + sources.Workload.Name, sources.Workload.Namespace) + return false, reason, message, nil } } - if sources.Namespace != nil && !v1alpha1.IsDisabledSource(sources.Namespace) && !k8sutils.IsTerminating(sources.Namespace) { - return true, nil + if sources.Namespace != nil && !odigosv1.IsDisabledSource(sources.Namespace) && !k8sutils.IsTerminating(sources.Namespace) { + reason := odigosv1.MarkedForInstrumentationReasonNamespaceSource + message := fmt.Sprintf("workload marked for automatic instrumentation by namespace source CR '%s' in namespace '%s'", + sources.Namespace.Name, sources.Namespace.Namespace) + return true, reason, message, nil } - return false, nil + reason := odigosv1.MarkedForInstrumentationReasonNoSource + message := "workload not marked for automatic instrumentation by any source CR" + return false, reason, message, nil } // IsSourceRelevant returns true if a Source: @@ -42,15 +57,15 @@ func IsObjectInstrumentedBySource(ctx context.Context, k8sClient client.Client, // 2) Exclusive AND terminating // This function alone should not be used to determine any instrumentation changes, and is provided // for the Instrumentor controllers to filter events. -func IsSourceRelevant(source *v1alpha1.Source) bool { - return v1alpha1.IsDisabledSource(source) == k8sutils.IsTerminating(source) +func IsSourceRelevant(source *odigosv1.Source) bool { + return odigosv1.IsDisabledSource(source) == k8sutils.IsTerminating(source) } // OtelServiceNameBySource returns the ReportedName for the given workload object. // OTel service name is only valid for workload sources (not namespace sources). // If none is configured, an empty string is returned. func OtelServiceNameBySource(ctx context.Context, k8sClient client.Client, obj client.Object) (string, error) { - sources, err := v1alpha1.GetSources(ctx, k8sClient, obj) + sources, err := odigosv1.GetSources(ctx, k8sClient, obj) if err != nil { return "", err } diff --git a/tests/e2e/workload-lifecycle/01-assert-instrumented.yaml b/tests/e2e/workload-lifecycle/01-assert-instrumented.yaml index 6963deb58b..5614e49b6f 100644 --- a/tests/e2e/workload-lifecycle/01-assert-instrumented.yaml +++ b/tests/e2e/workload-lifecycle/01-assert-instrumented.yaml @@ -5,6 +5,10 @@ metadata: name: deployment-nodejs-unsupported-version status: conditions: + - message: "workload marked for automatic instrumentation by namespace source CR 'default' in namespace 'default'" + reason: NamespaceSource + status: "True" + type: MarkedForInstrumentation - message: "nodejs runtime not supported by OpenTelemetry. supported versions: '>= 14', found: 8.17.0" reason: UnsupportedRuntimeVersion status: "False" @@ -18,6 +22,10 @@ metadata: name: deployment-nodejs-very-old-version status: conditions: + - message: "workload marked for automatic instrumentation by namespace source CR 'default' in namespace 'default'" + reason: NamespaceSource + status: "True" + type: MarkedForInstrumentation - message: "agent injected successfully to 1 containers: [nodejs-very-old-version]" reason: EnabledSuccessfully status: "True" @@ -35,6 +43,10 @@ metadata: name: deployment-nodejs-minimum-version status: conditions: + - message: "workload marked for automatic instrumentation by namespace source CR 'default' in namespace 'default'" + reason: NamespaceSource + status: "True" + type: MarkedForInstrumentation - message: "agent injected successfully to 1 containers: [nodejs-minimum-version]" reason: EnabledSuccessfully status: "True" @@ -77,6 +89,10 @@ metadata: name: deployment-nodejs-latest-version status: conditions: + - message: "workload marked for automatic instrumentation by namespace source CR 'default' in namespace 'default'" + reason: NamespaceSource + status: "True" + type: MarkedForInstrumentation - message: "agent injected successfully to 1 containers: [nodejs-latest-version]" reason: EnabledSuccessfully status: "True" @@ -119,6 +135,10 @@ metadata: name: deployment-nodejs-dockerfile-env status: conditions: + - message: "workload marked for automatic instrumentation by namespace source CR 'default' in namespace 'default'" + reason: NamespaceSource + status: "True" + type: MarkedForInstrumentation - message: "agent injected successfully to 1 containers: [nodejs-dockerfile-env]" reason: EnabledSuccessfully status: "True" @@ -161,6 +181,10 @@ metadata: name: deployment-nodejs-manifest-env status: conditions: + - message: "workload marked for automatic instrumentation by namespace source CR 'default' in namespace 'default'" + reason: NamespaceSource + status: "True" + type: MarkedForInstrumentation - message: "agent injected successfully to 1 containers: [nodejs-manifest-env]" reason: EnabledSuccessfully status: "True" @@ -203,6 +227,10 @@ metadata: name: deployment-cpp-http-server status: conditions: + - message: "workload marked for automatic instrumentation by namespace source CR 'default' in namespace 'default'" + reason: NamespaceSource + status: "True" + type: MarkedForInstrumentation - reason: UnsupportedProgrammingLanguage status: "False" type: AgentEnabled @@ -214,6 +242,10 @@ metadata: name: deployment-java-supported-version status: conditions: + - message: "workload marked for automatic instrumentation by namespace source CR 'default' in namespace 'default'" + reason: NamespaceSource + status: "True" + type: MarkedForInstrumentation - message: "agent injected successfully to 1 containers: [java-supported-version]" reason: EnabledSuccessfully status: "True" @@ -230,6 +262,10 @@ metadata: name: deployment-java-azul status: conditions: + - message: "workload marked for automatic instrumentation by namespace source CR 'default' in namespace 'default'" + reason: NamespaceSource + status: "True" + type: MarkedForInstrumentation - message: "agent injected successfully to 1 containers: [java-azul]" reason: EnabledSuccessfully status: "True" @@ -246,6 +282,10 @@ metadata: name: deployment-java-supported-docker-env status: conditions: + - message: "workload marked for automatic instrumentation by namespace source CR 'default' in namespace 'default'" + reason: NamespaceSource + status: "True" + type: MarkedForInstrumentation - message: "agent injected successfully to 1 containers: [java-supported-docker-env]" reason: EnabledSuccessfully status: "True" @@ -262,6 +302,10 @@ metadata: name: deployment-java-supported-manifest-env status: conditions: + - message: "workload marked for automatic instrumentation by namespace source CR 'default' in namespace 'default'" + reason: NamespaceSource + status: "True" + type: MarkedForInstrumentation - message: "agent injected successfully to 1 containers: [java-supported-manifest-env]" reason: EnabledSuccessfully status: "True" @@ -278,6 +322,10 @@ metadata: name: deployment-java-latest-version status: conditions: + - message: "workload marked for automatic instrumentation by namespace source CR 'default' in namespace 'default'" + reason: NamespaceSource + status: "True" + type: MarkedForInstrumentation - message: "agent injected successfully to 1 containers: [java-latest-version]" reason: EnabledSuccessfully status: "True" @@ -294,6 +342,10 @@ metadata: name: deployment-java-old-version status: conditions: + - message: "workload marked for automatic instrumentation by namespace source CR 'default' in namespace 'default'" + reason: NamespaceSource + status: "True" + type: MarkedForInstrumentation - message: "agent injected successfully to 1 containers: [java-old-version]" reason: EnabledSuccessfully status: "True" @@ -310,6 +362,10 @@ metadata: name: deployment-python-alpine status: conditions: + - message: "workload marked for automatic instrumentation by namespace source CR 'default' in namespace 'default'" + reason: NamespaceSource + status: "True" + type: MarkedForInstrumentation - message: "agent injected successfully to 1 containers: [python-alpine]" reason: EnabledSuccessfully status: "True" @@ -326,6 +382,10 @@ metadata: name: deployment-python-latest-version status: conditions: + - message: "workload marked for automatic instrumentation by namespace source CR 'default' in namespace 'default'" + reason: NamespaceSource + status: "True" + type: MarkedForInstrumentation - message: "agent injected successfully to 1 containers: [python-latest-version]" reason: EnabledSuccessfully status: "True" @@ -342,6 +402,10 @@ metadata: name: deployment-python-min-version status: conditions: + - message: "workload marked for automatic instrumentation by namespace source CR 'default' in namespace 'default'" + reason: NamespaceSource + status: "True" + type: MarkedForInstrumentation - message: "agent injected successfully to 1 containers: [python-min-version]" reason: EnabledSuccessfully status: "True" @@ -358,6 +422,10 @@ metadata: name: deployment-python-not-supported status: conditions: + - message: "workload marked for automatic instrumentation by namespace source CR 'default' in namespace 'default'" + reason: NamespaceSource + status: "True" + type: MarkedForInstrumentation - message: "python-runtime runtime not supported by OpenTelemetry. supported versions: '>= 3.8', found: 3.6.15" reason: UnsupportedRuntimeVersion status: "False" @@ -370,6 +438,10 @@ metadata: name: deployment-python-other-agent status: conditions: + - message: "workload marked for automatic instrumentation by namespace source CR 'default' in namespace 'default'" + reason: NamespaceSource + status: "True" + type: MarkedForInstrumentation - message: "odigos agent not enabled due to other instrumentation agent 'New Relic Agent' detected running in the container" reason: OtherAgentDetected status: "False" From fcab2a97215430b054123957f2d125ac638ab950 Mon Sep 17 00:00:00 2001 From: Mike Dame Date: Sun, 9 Feb 2025 15:15:58 -0500 Subject: [PATCH 20/30] odiglet: Initialize clientset at startup and do OpenShift selinux changes last (#2405) This does 2 things in the Odiglet: * **Make SELinux calls for openshift last in the init phase.** These functions `chroot` to the host directory to run selinux commands that update the agent permissions, so they are readable by pods. This `chroot` was preventing the k8s client from initializing with `open /var/run/secrets/kubernetes.io/serviceaccount/token: no such file or directory`. Moved last so the `chroot` doesn't mess up future changes. * **Initializes the k8s clientset in the main odiglet function.** This allows the same clientset to be passed through to the init phase (which uses it to apply labels to nodes) and the odiglet controller. Doing so makes `clientset` an argument to functions like `odiglet.New` and `k8snode.AddLabelToNode`, the latter of which is just a helper which should not be initializing its own clientset every call anyway. Technically, either one of these changes would have fixed the issue. But doing both is even better to help prevent future issues like this. --- k8sutils/pkg/node/node.go | 15 +---- odiglet/cmd/main.go | 16 +++++- odiglet/odiglet.go | 25 ++++----- odiglet/pkg/instrumentation/fs/agents.go | 70 +++++++++++++----------- 4 files changed, 65 insertions(+), 61 deletions(-) diff --git a/k8sutils/pkg/node/node.go b/k8sutils/pkg/node/node.go index 9f15a861b7..aa264e1549 100644 --- a/k8sutils/pkg/node/node.go +++ b/k8sutils/pkg/node/node.go @@ -6,27 +6,16 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/kubernetes" - "k8s.io/client-go/rest" "github.com/odigos-io/odigos/api/k8sconsts" "github.com/odigos-io/odigos/common" "github.com/odigos-io/odigos/k8sutils/pkg/env" ) -func AddLabelToNode(nodeName string, labelKey string, labelValue string) error { +func AddLabelToNode(clientset *kubernetes.Clientset, nodeName string, labelKey string, labelValue string) error { // Add odiglet installed label to node - cfg, err := rest.InClusterConfig() - if err != nil { - return err - } - - clientset, err := kubernetes.NewForConfig(cfg) - if err != nil { - return err - } - patch := []byte(`{"metadata": {"labels": {"` + labelKey + `": "` + labelValue + `"}}}`) - _, err = clientset.CoreV1().Nodes().Patch(context.Background(), nodeName, types.StrategicMergePatchType, patch, metav1.PatchOptions{}) + _, err := clientset.CoreV1().Nodes().Patch(context.Background(), nodeName, types.StrategicMergePatchType, patch, metav1.PatchOptions{}) if err != nil { return err } diff --git a/odiglet/cmd/main.go b/odiglet/cmd/main.go index 6dd8a6ce1a..1d50c7667b 100644 --- a/odiglet/cmd/main.go +++ b/odiglet/cmd/main.go @@ -5,6 +5,8 @@ import ( "github.com/odigos-io/odigos/odiglet" "github.com/odigos-io/odigos/odiglet/pkg/ebpf/sdks" + "k8s.io/client-go/kubernetes" + "k8s.io/client-go/rest" "github.com/odigos-io/odigos/common" commonInstrumentation "github.com/odigos-io/odigos/instrumentation" @@ -18,9 +20,19 @@ import ( ) func main() { + // Init Kubernetes clientset + cfg, err := rest.InClusterConfig() + if err != nil { + panic(err) + } + clientset, err := kubernetes.NewForConfig(cfg) + if err != nil { + panic(err) + } + // If started in init mode if len(os.Args) == 2 && os.Args[1] == "init" { - odiglet.OdigletInitPhase() + odiglet.OdigletInitPhase(clientset) } if err := log.Init(); err != nil { @@ -35,7 +47,7 @@ func main() { os.Exit(1) } - o, err := odiglet.New(deviceInjectionCallbacks(), ebpfInstrumentationFactories()) + o, err := odiglet.New(clientset, deviceInjectionCallbacks(), ebpfInstrumentationFactories()) if err != nil { log.Logger.Error(err, "Failed to initialize odiglet") os.Exit(1) diff --git a/odiglet/odiglet.go b/odiglet/odiglet.go index 287f0a9e35..7bd022d281 100644 --- a/odiglet/odiglet.go +++ b/odiglet/odiglet.go @@ -21,7 +21,6 @@ import ( "github.com/odigos-io/odigos/opampserver/pkg/server" "golang.org/x/sync/errgroup" "k8s.io/client-go/kubernetes" - "k8s.io/client-go/rest" controllerruntime "sigs.k8s.io/controller-runtime" ) @@ -39,18 +38,7 @@ const ( ) // New creates a new Odiglet instance. -func New(deviceInjectionCallbacks instrumentation.OtelSdksLsf, factories map[commonInstrumentation.OtelDistribution]commonInstrumentation.Factory) (*Odiglet, error) { - // Init Kubernetes API client - cfg, err := rest.InClusterConfig() - if err != nil { - return nil, fmt.Errorf("failed to create in-cluster config for Kubernetes client %w", err) - } - - clientset, err := kubernetes.NewForConfig(cfg) - if err != nil { - return nil, fmt.Errorf("failed to create Kubernetes client %w", err) - } - +func New(clientset *kubernetes.Clientset, deviceInjectionCallbacks instrumentation.OtelSdksLsf, factories map[commonInstrumentation.OtelDistribution]commonInstrumentation.Factory) (*Odiglet, error) { mgr, err := kube.CreateManager() if err != nil { return nil, fmt.Errorf("failed to create controller-runtime manager %w", err) @@ -180,7 +168,7 @@ func runDeviceManager(clientset *kubernetes.Clientset, otelSdkLsf instrumentatio return nil } -func OdigletInitPhase() { +func OdigletInitPhase(clientset *kubernetes.Clientset) { if err := log.Init(); err != nil { panic(err) } @@ -200,10 +188,17 @@ func OdigletInitPhase() { log.Logger.V(0).Info("Adding Label to Node", "odigletLabel", odigletInstalledLabel) - if err := k8snode.AddLabelToNode(nn, odigletInstalledLabel, k8sconsts.OdigletInstalledLabelValue); err != nil { + if err := k8snode.AddLabelToNode(clientset, nn, odigletInstalledLabel, k8sconsts.OdigletInstalledLabelValue); err != nil { log.Logger.Error(err, "Failed to add Odiglet installed label to the node") os.Exit(-1) } + // SELinux settings should be applied last. This function chroot's to use the host's PATH for + // executing selinux commands to make agents readable by pods. + if err := fs.ApplyOpenShiftSELinuxSettings(); err != nil { + log.Logger.Error(err, "Failed to apply SELinux settings on RHEL host") + os.Exit(-1) + } + os.Exit(0) } diff --git a/odiglet/pkg/instrumentation/fs/agents.go b/odiglet/pkg/instrumentation/fs/agents.go index f1775590c0..87319c357a 100644 --- a/odiglet/pkg/instrumentation/fs/agents.go +++ b/odiglet/pkg/instrumentation/fs/agents.go @@ -55,37 +55,6 @@ func CopyAgentsDirectoryToHost() error { return err } - // Check if the semanage command exists when running on RHEL/CoreOS - _, err = exec.LookPath(filepath.Join(chrootDir, semanagePath)) - if err == nil { - // Run the semanage command to add the new directory to the container_ro_file_t context - // semanage writes SELinux config to host - syscall.Chroot(chrootDir) - cmd := exec.Command(semanagePath, "fcontext", "-a", "-t", "container_ro_file_t", "/var/odigos(/.*)?") - err = cmd.Run() - if err != nil { - log.Logger.Error(err, "Error running semanage command") - } - - // Check if the restorecon command exists when running on RHEL/CoreOS - // restorecon applies the SELinux settings we just created to the host - // And we are already chrooted to the host path, so we can just look for restoreconPath now - _, err = exec.LookPath(restoreconPath) - if err == nil { - // Run the restorecon command to apply the new context - cmd := exec.Command(restoreconPath, "-r", k8sconsts.OdigosAgentsDirectory) - err = cmd.Run() - if err != nil { - log.Logger.Error(err, "Error running restorecon command") - } - } else { - log.Logger.Error(err, "Unable to find restorecon path") - } - - } else { - log.Logger.Error(err, "Unable to find semanage path") - } - return nil } @@ -173,3 +142,42 @@ func calculateFileHash(filePath string) (string, error) { return fmt.Sprintf("%x", hasher.Sum(nil)), nil } + +// ApplyOpenShiftSELinuxSettings makes auto-instrumentation agents readable by containers on RHEL hosts. +// Note: This function calls chroot to use the host's PATH to execute selinux commands. Calling it will +// affect the odiglet running process's apparent filesystem. +func ApplyOpenShiftSELinuxSettings() error { + // Check if the semanage command exists when running on RHEL/CoreOS + _, err := exec.LookPath(filepath.Join(chrootDir, semanagePath)) + if err == nil { + // Run the semanage command to add the new directory to the container_ro_file_t context + // semanage writes SELinux config to host + syscall.Chroot(chrootDir) + cmd := exec.Command(semanagePath, "fcontext", "-a", "-t", "container_ro_file_t", "/var/odigos(/.*)?") + err = cmd.Run() + if err != nil { + log.Logger.Error(err, "Error running semanage command") + return err + } + + // Check if the restorecon command exists when running on RHEL/CoreOS + // restorecon applies the SELinux settings we just created to the host + // And we are already chrooted to the host path, so we can just look for restoreconPath now + _, err = exec.LookPath(restoreconPath) + if err == nil { + // Run the restorecon command to apply the new context + cmd := exec.Command(restoreconPath, "-r", k8sconsts.OdigosAgentsDirectory) + err = cmd.Run() + if err != nil { + log.Logger.Error(err, "Error running restorecon command") + return err + } + } else { + log.Logger.Error(err, "Unable to find restorecon path") + return err + } + } else { + log.Logger.Info("Unable to find semanage path, possibly not on RHEL host") + } + return nil +} From 092c8a6955ed71259865cd2ff221d4a9e08c6adc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Feb 2025 12:29:18 +0200 Subject: [PATCH 21/30] chore(deps): bump lycheeverse/lychee-action from 2.2.0 to 2.3.0 (#2415) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [lycheeverse/lychee-action](https://github.com/lycheeverse/lychee-action) from 2.2.0 to 2.3.0.
Release notes

Sourced from lycheeverse/lychee-action's releases.

Version 2.3.0

What's Changed

New Contributors

Full Changelog: https://github.com/lycheeverse/lychee-action/compare/v2...v2.3.0

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=lycheeverse/lychee-action&package-manager=github_actions&previous-version=2.2.0&new-version=2.3.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Amir Blum --- .github/workflows/check-links.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-links.yml b/.github/workflows/check-links.yml index b400e3d8b2..44fba7fc65 100644 --- a/.github/workflows/check-links.yml +++ b/.github/workflows/check-links.yml @@ -11,7 +11,7 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: lycheeverse/lychee-action@v2.2.0 + - uses: lycheeverse/lychee-action@v2.3.0 with: args: >- -v -n "*.md" "**/*.md" "**/*.mdx" From 087fb08c45d3e31b5822b53d58090c0d5d1b753c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Feb 2025 13:42:31 +0200 Subject: [PATCH 22/30] chore(deps): bump golang.org/x/sync from 0.10.0 to 0.11.0 in /odiglet (#2418) Bumps [golang.org/x/sync](https://github.com/golang/sync) from 0.10.0 to 0.11.0.
Commits
  • fe3591b sync/errgroup: improve documentation for semaphore limit behavior
  • See full diff in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=golang.org/x/sync&package-manager=go_modules&previous-version=0.10.0&new-version=0.11.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Amir Blum --- odiglet/go.mod | 2 +- odiglet/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/odiglet/go.mod b/odiglet/go.mod index 89626dd1c9..cbcdf0f3fc 100644 --- a/odiglet/go.mod +++ b/odiglet/go.mod @@ -21,7 +21,7 @@ require ( go.opentelemetry.io/otel v1.34.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 go.uber.org/zap v1.27.0 - golang.org/x/sync v0.10.0 + golang.org/x/sync v0.11.0 k8s.io/api v0.32.1 k8s.io/apimachinery v0.32.1 k8s.io/client-go v0.32.1 diff --git a/odiglet/go.sum b/odiglet/go.sum index d2c82c515c..de1aa5650b 100644 --- a/odiglet/go.sum +++ b/odiglet/go.sum @@ -430,8 +430,8 @@ golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= -golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w= +golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= From 95104530d059b1a528c0179ea8f270146caa357a Mon Sep 17 00:00:00 2001 From: Tamir David Date: Mon, 10 Feb 2025 13:47:43 +0200 Subject: [PATCH 23/30] Fix cross providers tests (#2419) This PR is to fix a breaking change in the semantics of the `imagePrefix` flag --- helm/odigos/templates/_helpers.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/odigos/templates/_helpers.tpl b/helm/odigos/templates/_helpers.tpl index 8c32e2900c..4352889cfc 100644 --- a/helm/odigos/templates/_helpers.tpl +++ b/helm/odigos/templates/_helpers.tpl @@ -2,7 +2,7 @@ {{- $defaultRegistry := "docker.io/keyval" -}} {{- $redHatRegistry := "registry.connect.redhat.com/odigos" -}} {{- if $.Values.imagePrefix -}} - {{- $.Values.imagePrefix -}}/ + {{- $.Values.imagePrefix -}}/keyval/ {{- else -}} {{- if $.Values.openshift.enabled -}} {{- $redHatRegistry -}}/ From ecdf43065e275b2cb1dc0ab8d3a43844e935c378 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Feb 2025 15:44:46 +0200 Subject: [PATCH 24/30] chore(deps): bump github.com/spf13/pflag from 1.0.5 to 1.0.6 in /cli (#2416) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [github.com/spf13/pflag](https://github.com/spf13/pflag) from 1.0.5 to 1.0.6.
Release notes

Sourced from github.com/spf13/pflag's releases.

v1.0.6

What's Changed

New Contributors

Full Changelog: https://github.com/spf13/pflag/compare/v1.0.5...v1.0.6

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=github.com/spf13/pflag&package-manager=go_modules&previous-version=1.0.5&new-version=1.0.6)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
--------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Amir Blum --- cli/go.mod | 2 +- cli/go.sum | 3 ++- scripts/cli-docgen/go.mod | 2 +- scripts/cli-docgen/go.sum | 3 ++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cli/go.mod b/cli/go.mod index 22dee928ca..9b7b045313 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -10,7 +10,7 @@ require ( github.com/odigos-io/odigos/k8sutils v0.0.0 github.com/odigos-io/odigos/profiles v0.0.0 github.com/spf13/cobra v1.8.1 - github.com/spf13/pflag v1.0.5 + github.com/spf13/pflag v1.0.6 gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.32.1 k8s.io/apiextensions-apiserver v0.32.1 diff --git a/cli/go.sum b/cli/go.sum index 5ee6cb9108..cd42f410d9 100644 --- a/cli/go.sum +++ b/cli/go.sum @@ -99,8 +99,9 @@ github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWN github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y= -github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o= +github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= diff --git a/scripts/cli-docgen/go.mod b/scripts/cli-docgen/go.mod index 31d82d5ea4..774d7a6f56 100644 --- a/scripts/cli-docgen/go.mod +++ b/scripts/cli-docgen/go.mod @@ -44,7 +44,7 @@ require ( github.com/odigos-io/odigos/profiles v0.0.0 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect - github.com/spf13/pflag v1.0.5 // indirect + github.com/spf13/pflag v1.0.6 // indirect github.com/x448/float16 v0.8.4 // indirect go.opentelemetry.io/otel v1.34.0 // indirect go.opentelemetry.io/otel/trace v1.34.0 // indirect diff --git a/scripts/cli-docgen/go.sum b/scripts/cli-docgen/go.sum index f62340c605..1c7726fb2a 100644 --- a/scripts/cli-docgen/go.sum +++ b/scripts/cli-docgen/go.sum @@ -101,8 +101,9 @@ github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y= -github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o= +github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= From 8dbd659a5466332089c6569a2609511afd8a45fc Mon Sep 17 00:00:00 2001 From: Ben Elferink Date: Mon, 10 Feb 2025 18:03:39 +0200 Subject: [PATCH 25/30] Feat: UI Containers (#2414) This PR removes most of the UI code, and re-uses from the `@odigos/ui-containers` lib. --- CONTRIBUTING.md | 59 +- frontend/graph/conversions.go | 26 - frontend/graph/generated.go | 1449 ++++++++--------- frontend/graph/model/destination.go | 47 - frontend/graph/model/models_gen.go | 67 +- frontend/graph/schema.graphqls | 47 +- frontend/graph/schema.resolvers.go | 51 +- frontend/services/destinations.go | 80 +- frontend/webapp/@types/actions.ts | 41 + frontend/webapp/@types/compute-platform.ts | 24 + frontend/webapp/@types/config.ts | 12 + frontend/webapp/@types/destinations.ts | 40 + frontend/webapp/{types => @types}/index.ts | 5 +- .../webapp/@types/instrumentation-rules.ts | 14 + frontend/webapp/@types/namespace.ts | 12 + frontend/webapp/@types/sources.ts | 9 + frontend/webapp/README.md | 58 +- frontend/webapp/app/(overview)/layout.tsx | 32 - .../webapp/app/(overview)/overview/page.tsx | 27 - .../app/(setup)/choose-destination/page.tsx | 57 +- .../app/(setup)/choose-sources/page.tsx | 50 +- frontend/webapp/app/(setup)/layout.tsx | 32 - frontend/webapp/app/(setup)/styled.ts | 11 - frontend/webapp/app/layout.tsx | 64 +- frontend/webapp/app/overview/page.tsx | 63 + frontend/webapp/app/page.tsx | 5 +- .../components/app-error-boundary/index.tsx | 60 - .../webapp/components/common/buttons/index.ts | 1 - .../common/buttons/selection-button/index.tsx | 49 - .../common/dropdowns/error-dropdown/index.tsx | 34 - .../components/common/dropdowns/index.ts | 5 - .../dropdowns/language-dropdown/index.tsx | 33 - .../dropdowns/monitor-dropdown/index.tsx | 27 - .../dropdowns/namespace-dropdown/index.tsx | 31 - .../common/dropdowns/type-dropdown/index.tsx | 31 - frontend/webapp/components/common/index.ts | 2 - frontend/webapp/components/index.ts | 7 +- .../lib-imports/overview-header.tsx | 42 + .../overview-modals-and-drawers.tsx | 74 + .../components/lib-imports/setup-header.tsx | 94 ++ .../components/main/header/cp-title/index.tsx | 54 - .../webapp/components/main/header/index.tsx | 70 - frontend/webapp/components/main/index.tsx | 1 - .../nodes-data-flow/edges/labeled-edge.tsx | 61 - .../components/nodes-data-flow/index.tsx | 91 -- .../nodes-data-flow/nodes/add-node.tsx | 95 -- .../nodes-data-flow/nodes/base-node.tsx | 79 - .../nodes-data-flow/nodes/edged-node.tsx | 34 - .../nodes-data-flow/nodes/frame-node.tsx | 36 - .../nodes-data-flow/nodes/header-node.tsx | 105 -- .../nodes-data-flow/nodes/scroll-node.tsx | 145 -- .../nodes-data-flow/nodes/skeleton-node.tsx | 32 - .../webapp/components/notification/index.ts | 4 - .../notification/notification-manager.tsx | 201 --- .../components/notification/toast-list.tsx | 63 - .../components/overview/add-entity/index.tsx | 129 -- .../overview/all-drawers/cli-drawer.tsx | 189 --- .../components/overview/all-drawers/index.tsx | 33 - .../components/overview/all-modals/index.tsx | 32 - frontend/webapp/components/overview/index.ts | 5 - .../providers/apollo-provider.tsx} | 11 +- .../components/providers/error-boundary.tsx | 88 + .../providers}/theme-provider.tsx | 10 +- .../webapp/components/setup/header/index.tsx | 41 - frontend/webapp/components/setup/index.tsx | 2 - .../webapp/components/setup/menu/index.tsx | 133 -- frontend/webapp/components/styled.tsx | 25 + frontend/webapp/containers/index.ts | 1 - .../main/actions/action-drawer/build-card.ts | 97 -- .../action-drawer/build-drawer-item.ts | 22 - .../main/actions/action-drawer/index.tsx | 160 -- .../custom-fields/add-cluster-info.tsx | 40 - .../custom-fields/delete-attributes.tsx | 30 - .../custom-fields/error-sampler.tsx | 39 - .../action-form-body/custom-fields/index.tsx | 44 - .../custom-fields/latency-sampler.tsx | 70 - .../custom-fields/pii-masking.tsx | 77 - .../custom-fields/probabilistic-sampler.tsx | 39 - .../custom-fields/rename-attributes.tsx | 39 - .../main/actions/action-form-body/index.tsx | 74 - .../main/actions/action-modal/index.tsx | 80 - .../webapp/containers/main/actions/index.ts | 3 - .../configured-destinations-list/index.tsx | 63 - .../destinations/add-destination/index.tsx | 128 -- .../destination-drawer/build-card.ts | 61 - .../destination-drawer/build-drawer-item.ts | 24 - .../destinations/destination-drawer/index.tsx | 171 -- .../dynamic-fields/index.tsx | 63 - .../destination-form-body/index.tsx | 182 --- .../test-connection/index.tsx | 68 - .../destinations-list/index.tsx | 74 - .../potential-destinations-list/index.tsx | 50 - .../choose-destination-body/index.tsx | 85 - .../destinations/destination-modal/index.tsx | 153 -- .../containers/main/destinations/index.tsx | 4 - frontend/webapp/containers/main/index.ts | 5 - .../main/instrumentation-rules/index.ts | 3 - .../rule-drawer/build-card.ts | 29 - .../rule-drawer/build-drawer-item.ts | 35 - .../rule-drawer/index.tsx | 156 -- .../custom-fields/code-attributes.tsx | 136 -- .../rule-form-body/custom-fields/index.tsx | 36 - .../custom-fields/payload-collection.tsx | 102 -- .../rule-form-body/index.tsx | 65 - .../rule-modal/index.tsx | 89 - .../webapp/containers/main/overview/index.ts | 1 - .../overview/multi-source-control/index.tsx | 96 -- .../overview-actions-menu/filters/index.tsx | 145 -- .../overview/overview-actions-menu/index.tsx | 99 -- .../overview-actions-menu/search/index.tsx | 47 - .../search/recent-searches/index.tsx | 12 - .../search/search-results/builder.ts | 84 - .../search/search-results/index.tsx | 90 - .../overview/overview-actions-menu/styled.ts | 17 - .../overview-data-flow/build-action-nodes.ts | 109 -- .../build-destination-nodes.ts | 94 -- .../overview-data-flow/build-edges.ts | 72 - .../overview-data-flow/build-rule-nodes.ts | 93 -- .../overview-data-flow/build-source-nodes.ts | 124 -- .../overview-data-flow/get-node-positions.ts | 49 - .../overview/overview-data-flow/index.tsx | 127 -- .../overview-data-flow/node-config.json | 5 - .../main/overview/overview-drawer/index.tsx | 239 --- .../choose-source-modal/index.tsx | 55 - .../choose-sources-body-fast/index.tsx | 18 - .../source-controls/index.tsx | 44 - .../sources-list/index.tsx | 161 -- .../choose-sources-body-simple/index.tsx | 18 - .../source-controls/index.tsx | 74 - .../sources-list/index.tsx | 108 -- .../choose-sources-body/index.tsx | 22 - .../main/sources/choose-sources/index.tsx | 57 - .../webapp/containers/main/sources/index.ts | 5 - .../source-drawer-container/build-card.ts | 17 - .../build-drawer-item.ts | 21 - .../sources/source-drawer-container/index.tsx | 209 --- .../main/sources/update-source-body/index.tsx | 34 - .../webapp/graphql/queries/destination.ts | 44 +- frontend/webapp/hooks/actions/index.ts | 1 - .../webapp/hooks/actions/useActionCRUD.ts | 148 +- .../webapp/hooks/actions/useActionFormData.ts | 114 -- frontend/webapp/hooks/common/index.ts | 2 - .../webapp/hooks/common/useContainerSize.ts | 25 - .../webapp/hooks/common/useGenericForm.ts | 62 - .../compute-platform/useComputePlatform.ts | 9 +- .../hooks/compute-platform/useNamespace.ts | 28 +- .../compute-platform/usePaginatedSources.ts | 14 +- frontend/webapp/hooks/config/useConfig.ts | 11 +- .../hooks/describe/useDescribeOdigos.ts | 43 +- .../hooks/describe/useDescribeSource.ts | 52 +- frontend/webapp/hooks/destinations/index.ts | 3 +- .../hooks/destinations/useDestinationCRUD.ts | 44 +- .../destinations/useDestinationCategories.ts | 9 + .../destinations/useDestinationFormData.ts | 198 --- .../hooks/destinations/useDestinationTypes.ts | 32 - .../destinations/usePotentialDestinations.ts | 27 +- .../hooks/destinations/useTestConnection.ts | 12 +- frontend/webapp/hooks/index.ts | 1 - .../hooks/instrumentation-rules/index.ts | 1 - .../useInstrumentationRuleCRUD.ts | 25 +- .../useInstrumentationRuleFormData.ts | 94 -- frontend/webapp/hooks/notification/index.ts | 1 - .../hooks/notification/useClickNotif.ts | 72 - frontend/webapp/hooks/notification/useSSE.ts | 23 +- frontend/webapp/hooks/overview/index.ts | 1 - frontend/webapp/hooks/overview/useMetrics.ts | 26 +- .../hooks/overview/useNodeDataFlowHandlers.ts | 103 -- frontend/webapp/hooks/sources/index.ts | 1 - .../webapp/hooks/sources/useSourceCRUD.ts | 56 +- .../webapp/hooks/sources/useSourceFormData.ts | 233 --- frontend/webapp/hooks/tokens/useTokenCRUD.ts | 9 +- .../webapp/hooks/tokens/useTokenTracker.ts | 8 +- frontend/webapp/lib/gql/index.ts | 1 - frontend/webapp/lib/index.ts | 1 - frontend/webapp/package.json | 29 +- frontend/webapp/store/index.ts | 7 - frontend/webapp/store/useAppStore.ts | 43 - frontend/webapp/store/useDarkModeStore.ts | 11 - frontend/webapp/store/useDrawerStore.ts | 29 - frontend/webapp/store/useFilterStore.ts | 68 - frontend/webapp/store/useModalStore.ts | 11 - frontend/webapp/store/useNotificationStore.ts | 96 -- frontend/webapp/store/usePaginatedStore.ts | 4 +- frontend/webapp/store/usePendingStore.ts | 70 - frontend/webapp/styled-component.d.ts | 6 - frontend/webapp/styles/index.ts | 2 - frontend/webapp/styles/styled.tsx | 10 - frontend/webapp/types/actions.ts | 74 - frontend/webapp/types/common.ts | 47 - frontend/webapp/types/compute-platform.ts | 37 - frontend/webapp/types/data-flow.ts | 13 - frontend/webapp/types/describe.ts | 119 -- frontend/webapp/types/destinations.ts | 163 -- .../webapp/types/instrumentation-rules.ts | 115 -- frontend/webapp/types/metrics.ts | 20 - frontend/webapp/types/namespace.ts | 4 - frontend/webapp/types/sources.ts | 29 - frontend/webapp/utils/constants/config.tsx | 10 - frontend/webapp/utils/constants/index.tsx | 4 - frontend/webapp/utils/constants/numbers.ts | 1 - .../utils/constants/programming-languages.ts | 29 - frontend/webapp/utils/constants/string.tsx | 106 -- .../utils/functions/extract-monitors/index.ts | 8 - frontend/webapp/utils/functions/index.ts | 2 - .../utils/functions/is-enterprise/index.ts | 1 - frontend/webapp/utils/index.ts | 1 - frontend/webapp/yarn.lock | 768 +++------ 207 files changed, 2109 insertions(+), 10946 deletions(-) create mode 100644 frontend/webapp/@types/actions.ts create mode 100644 frontend/webapp/@types/compute-platform.ts create mode 100644 frontend/webapp/@types/config.ts create mode 100644 frontend/webapp/@types/destinations.ts rename frontend/webapp/{types => @types}/index.ts (63%) create mode 100644 frontend/webapp/@types/instrumentation-rules.ts create mode 100644 frontend/webapp/@types/namespace.ts create mode 100644 frontend/webapp/@types/sources.ts delete mode 100644 frontend/webapp/app/(overview)/layout.tsx delete mode 100644 frontend/webapp/app/(overview)/overview/page.tsx delete mode 100644 frontend/webapp/app/(setup)/layout.tsx delete mode 100644 frontend/webapp/app/(setup)/styled.ts create mode 100644 frontend/webapp/app/overview/page.tsx delete mode 100644 frontend/webapp/components/app-error-boundary/index.tsx delete mode 100644 frontend/webapp/components/common/buttons/index.ts delete mode 100644 frontend/webapp/components/common/buttons/selection-button/index.tsx delete mode 100644 frontend/webapp/components/common/dropdowns/error-dropdown/index.tsx delete mode 100644 frontend/webapp/components/common/dropdowns/index.ts delete mode 100644 frontend/webapp/components/common/dropdowns/language-dropdown/index.tsx delete mode 100644 frontend/webapp/components/common/dropdowns/monitor-dropdown/index.tsx delete mode 100644 frontend/webapp/components/common/dropdowns/namespace-dropdown/index.tsx delete mode 100644 frontend/webapp/components/common/dropdowns/type-dropdown/index.tsx delete mode 100644 frontend/webapp/components/common/index.ts create mode 100644 frontend/webapp/components/lib-imports/overview-header.tsx create mode 100644 frontend/webapp/components/lib-imports/overview-modals-and-drawers.tsx create mode 100644 frontend/webapp/components/lib-imports/setup-header.tsx delete mode 100644 frontend/webapp/components/main/header/cp-title/index.tsx delete mode 100644 frontend/webapp/components/main/header/index.tsx delete mode 100644 frontend/webapp/components/main/index.tsx delete mode 100644 frontend/webapp/components/nodes-data-flow/edges/labeled-edge.tsx delete mode 100644 frontend/webapp/components/nodes-data-flow/index.tsx delete mode 100644 frontend/webapp/components/nodes-data-flow/nodes/add-node.tsx delete mode 100644 frontend/webapp/components/nodes-data-flow/nodes/base-node.tsx delete mode 100644 frontend/webapp/components/nodes-data-flow/nodes/edged-node.tsx delete mode 100644 frontend/webapp/components/nodes-data-flow/nodes/frame-node.tsx delete mode 100644 frontend/webapp/components/nodes-data-flow/nodes/header-node.tsx delete mode 100644 frontend/webapp/components/nodes-data-flow/nodes/scroll-node.tsx delete mode 100644 frontend/webapp/components/nodes-data-flow/nodes/skeleton-node.tsx delete mode 100644 frontend/webapp/components/notification/index.ts delete mode 100644 frontend/webapp/components/notification/notification-manager.tsx delete mode 100644 frontend/webapp/components/notification/toast-list.tsx delete mode 100644 frontend/webapp/components/overview/add-entity/index.tsx delete mode 100644 frontend/webapp/components/overview/all-drawers/cli-drawer.tsx delete mode 100644 frontend/webapp/components/overview/all-drawers/index.tsx delete mode 100644 frontend/webapp/components/overview/all-modals/index.tsx delete mode 100644 frontend/webapp/components/overview/index.ts rename frontend/webapp/{lib/gql/apollo-wrapper.tsx => components/providers/apollo-provider.tsx} (86%) create mode 100644 frontend/webapp/components/providers/error-boundary.tsx rename frontend/webapp/{styles => components/providers}/theme-provider.tsx (83%) delete mode 100644 frontend/webapp/components/setup/header/index.tsx delete mode 100644 frontend/webapp/components/setup/index.tsx delete mode 100644 frontend/webapp/components/setup/menu/index.tsx create mode 100644 frontend/webapp/components/styled.tsx delete mode 100644 frontend/webapp/containers/index.ts delete mode 100644 frontend/webapp/containers/main/actions/action-drawer/build-card.ts delete mode 100644 frontend/webapp/containers/main/actions/action-drawer/build-drawer-item.ts delete mode 100644 frontend/webapp/containers/main/actions/action-drawer/index.tsx delete mode 100644 frontend/webapp/containers/main/actions/action-form-body/custom-fields/add-cluster-info.tsx delete mode 100644 frontend/webapp/containers/main/actions/action-form-body/custom-fields/delete-attributes.tsx delete mode 100644 frontend/webapp/containers/main/actions/action-form-body/custom-fields/error-sampler.tsx delete mode 100644 frontend/webapp/containers/main/actions/action-form-body/custom-fields/index.tsx delete mode 100644 frontend/webapp/containers/main/actions/action-form-body/custom-fields/latency-sampler.tsx delete mode 100644 frontend/webapp/containers/main/actions/action-form-body/custom-fields/pii-masking.tsx delete mode 100644 frontend/webapp/containers/main/actions/action-form-body/custom-fields/probabilistic-sampler.tsx delete mode 100644 frontend/webapp/containers/main/actions/action-form-body/custom-fields/rename-attributes.tsx delete mode 100644 frontend/webapp/containers/main/actions/action-form-body/index.tsx delete mode 100644 frontend/webapp/containers/main/actions/action-modal/index.tsx delete mode 100644 frontend/webapp/containers/main/actions/index.ts delete mode 100644 frontend/webapp/containers/main/destinations/add-destination/configured-destinations-list/index.tsx delete mode 100644 frontend/webapp/containers/main/destinations/add-destination/index.tsx delete mode 100644 frontend/webapp/containers/main/destinations/destination-drawer/build-card.ts delete mode 100644 frontend/webapp/containers/main/destinations/destination-drawer/build-drawer-item.ts delete mode 100644 frontend/webapp/containers/main/destinations/destination-drawer/index.tsx delete mode 100644 frontend/webapp/containers/main/destinations/destination-form-body/dynamic-fields/index.tsx delete mode 100644 frontend/webapp/containers/main/destinations/destination-form-body/index.tsx delete mode 100644 frontend/webapp/containers/main/destinations/destination-form-body/test-connection/index.tsx delete mode 100644 frontend/webapp/containers/main/destinations/destination-modal/choose-destination-body/destinations-list/index.tsx delete mode 100644 frontend/webapp/containers/main/destinations/destination-modal/choose-destination-body/destinations-list/potential-destinations-list/index.tsx delete mode 100644 frontend/webapp/containers/main/destinations/destination-modal/choose-destination-body/index.tsx delete mode 100644 frontend/webapp/containers/main/destinations/destination-modal/index.tsx delete mode 100644 frontend/webapp/containers/main/destinations/index.tsx delete mode 100644 frontend/webapp/containers/main/index.ts delete mode 100644 frontend/webapp/containers/main/instrumentation-rules/index.ts delete mode 100644 frontend/webapp/containers/main/instrumentation-rules/rule-drawer/build-card.ts delete mode 100644 frontend/webapp/containers/main/instrumentation-rules/rule-drawer/build-drawer-item.ts delete mode 100644 frontend/webapp/containers/main/instrumentation-rules/rule-drawer/index.tsx delete mode 100644 frontend/webapp/containers/main/instrumentation-rules/rule-form-body/custom-fields/code-attributes.tsx delete mode 100644 frontend/webapp/containers/main/instrumentation-rules/rule-form-body/custom-fields/index.tsx delete mode 100644 frontend/webapp/containers/main/instrumentation-rules/rule-form-body/custom-fields/payload-collection.tsx delete mode 100644 frontend/webapp/containers/main/instrumentation-rules/rule-form-body/index.tsx delete mode 100644 frontend/webapp/containers/main/instrumentation-rules/rule-modal/index.tsx delete mode 100644 frontend/webapp/containers/main/overview/index.ts delete mode 100644 frontend/webapp/containers/main/overview/multi-source-control/index.tsx delete mode 100644 frontend/webapp/containers/main/overview/overview-actions-menu/filters/index.tsx delete mode 100644 frontend/webapp/containers/main/overview/overview-actions-menu/index.tsx delete mode 100644 frontend/webapp/containers/main/overview/overview-actions-menu/search/index.tsx delete mode 100644 frontend/webapp/containers/main/overview/overview-actions-menu/search/recent-searches/index.tsx delete mode 100644 frontend/webapp/containers/main/overview/overview-actions-menu/search/search-results/builder.ts delete mode 100644 frontend/webapp/containers/main/overview/overview-actions-menu/search/search-results/index.tsx delete mode 100644 frontend/webapp/containers/main/overview/overview-actions-menu/styled.ts delete mode 100644 frontend/webapp/containers/main/overview/overview-data-flow/build-action-nodes.ts delete mode 100644 frontend/webapp/containers/main/overview/overview-data-flow/build-destination-nodes.ts delete mode 100644 frontend/webapp/containers/main/overview/overview-data-flow/build-edges.ts delete mode 100644 frontend/webapp/containers/main/overview/overview-data-flow/build-rule-nodes.ts delete mode 100644 frontend/webapp/containers/main/overview/overview-data-flow/build-source-nodes.ts delete mode 100644 frontend/webapp/containers/main/overview/overview-data-flow/get-node-positions.ts delete mode 100644 frontend/webapp/containers/main/overview/overview-data-flow/index.tsx delete mode 100644 frontend/webapp/containers/main/overview/overview-data-flow/node-config.json delete mode 100644 frontend/webapp/containers/main/overview/overview-drawer/index.tsx delete mode 100644 frontend/webapp/containers/main/sources/choose-sources/choose-source-modal/index.tsx delete mode 100644 frontend/webapp/containers/main/sources/choose-sources/choose-sources-body/choose-sources-body-fast/index.tsx delete mode 100644 frontend/webapp/containers/main/sources/choose-sources/choose-sources-body/choose-sources-body-fast/source-controls/index.tsx delete mode 100644 frontend/webapp/containers/main/sources/choose-sources/choose-sources-body/choose-sources-body-fast/sources-list/index.tsx delete mode 100644 frontend/webapp/containers/main/sources/choose-sources/choose-sources-body/choose-sources-body-simple/index.tsx delete mode 100644 frontend/webapp/containers/main/sources/choose-sources/choose-sources-body/choose-sources-body-simple/source-controls/index.tsx delete mode 100644 frontend/webapp/containers/main/sources/choose-sources/choose-sources-body/choose-sources-body-simple/sources-list/index.tsx delete mode 100644 frontend/webapp/containers/main/sources/choose-sources/choose-sources-body/index.tsx delete mode 100644 frontend/webapp/containers/main/sources/choose-sources/index.tsx delete mode 100644 frontend/webapp/containers/main/sources/index.ts delete mode 100644 frontend/webapp/containers/main/sources/source-drawer-container/build-card.ts delete mode 100644 frontend/webapp/containers/main/sources/source-drawer-container/build-drawer-item.ts delete mode 100644 frontend/webapp/containers/main/sources/source-drawer-container/index.tsx delete mode 100644 frontend/webapp/containers/main/sources/update-source-body/index.tsx delete mode 100644 frontend/webapp/hooks/actions/useActionFormData.ts delete mode 100644 frontend/webapp/hooks/common/index.ts delete mode 100644 frontend/webapp/hooks/common/useContainerSize.ts delete mode 100644 frontend/webapp/hooks/common/useGenericForm.ts create mode 100644 frontend/webapp/hooks/destinations/useDestinationCategories.ts delete mode 100644 frontend/webapp/hooks/destinations/useDestinationFormData.ts delete mode 100644 frontend/webapp/hooks/destinations/useDestinationTypes.ts delete mode 100644 frontend/webapp/hooks/instrumentation-rules/useInstrumentationRuleFormData.ts delete mode 100644 frontend/webapp/hooks/notification/useClickNotif.ts delete mode 100644 frontend/webapp/hooks/overview/useNodeDataFlowHandlers.ts delete mode 100644 frontend/webapp/hooks/sources/useSourceFormData.ts delete mode 100644 frontend/webapp/lib/gql/index.ts delete mode 100644 frontend/webapp/lib/index.ts delete mode 100644 frontend/webapp/store/useAppStore.ts delete mode 100644 frontend/webapp/store/useDarkModeStore.ts delete mode 100644 frontend/webapp/store/useDrawerStore.ts delete mode 100644 frontend/webapp/store/useFilterStore.ts delete mode 100644 frontend/webapp/store/useModalStore.ts delete mode 100644 frontend/webapp/store/useNotificationStore.ts delete mode 100644 frontend/webapp/store/usePendingStore.ts delete mode 100644 frontend/webapp/styled-component.d.ts delete mode 100644 frontend/webapp/styles/index.ts delete mode 100644 frontend/webapp/styles/styled.tsx delete mode 100644 frontend/webapp/types/actions.ts delete mode 100644 frontend/webapp/types/common.ts delete mode 100644 frontend/webapp/types/compute-platform.ts delete mode 100644 frontend/webapp/types/data-flow.ts delete mode 100644 frontend/webapp/types/describe.ts delete mode 100644 frontend/webapp/types/destinations.ts delete mode 100644 frontend/webapp/types/instrumentation-rules.ts delete mode 100644 frontend/webapp/types/metrics.ts delete mode 100644 frontend/webapp/types/namespace.ts delete mode 100644 frontend/webapp/types/sources.ts delete mode 100644 frontend/webapp/utils/constants/config.tsx delete mode 100644 frontend/webapp/utils/constants/numbers.ts delete mode 100644 frontend/webapp/utils/constants/programming-languages.ts delete mode 100644 frontend/webapp/utils/constants/string.tsx delete mode 100644 frontend/webapp/utils/functions/extract-monitors/index.ts delete mode 100644 frontend/webapp/utils/functions/index.ts delete mode 100644 frontend/webapp/utils/functions/is-enterprise/index.ts diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index dcdab1ca0e..dee80d7c42 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,23 +1,23 @@ # Contributing Guide -* [Welcome](#welcome) -* [Ways to Contribute](#ways-to-contribute) -* [Find an Issue](#find-an-issue) -* [Issue Guidelines](#issue-guidelines) -* [Pull Request Guidelines](#pull-request-guidelines) -* [Communication](#communication) -* [Code Review Process](#code-review-process) -* [Testing Requirements](#testing-requirements) -* [Code of Conduct](#code-of-conduct) -* [License](#license) -* [Local Development](#local-development) +- [Welcome](#welcome) +- [Ways to Contribute](#ways-to-contribute) +- [Find an Issue](#find-an-issue) +- [Issue Guidelines](#issue-guidelines) +- [Pull Request Guidelines](#pull-request-guidelines) +- [Communication](#communication) +- [Code Review Process](#code-review-process) +- [Testing Requirements](#testing-requirements) +- [Code of Conduct](#code-of-conduct) +- [License](#license) +- [Local Development](#local-development) - [Run Odigos CLI from Code](#run-odigos-cli-from-code) - [How to Develop Odigos Locally](#how-to-develop-odigos-locally) - [How to Build and Run Odigos Frontend Locally](#how-to-build-and-run-odigos-frontend-locally) -* [Odiglet](#odiglet) +- [Odiglet](#odiglet) - [Builder Base Image](#builder-base-image) - [Remote Debugging](#remote-debugging) -* [Instrumentor](#instrumentor) +- [Instrumentor](#instrumentor) - [Debugging](#debugging) Welcome! We are glad that you want to contribute to our project! 💖 @@ -120,11 +120,11 @@ First, follow the [Quickstart Guide](https://docs.odigos.io/quickstart/introduct Make sure you are able to: -- [X] run Odigos CLI in your terminal. -- [X] open the demo application UI in your browser to interact with it. -- [X] install odigos in your development cluster with `odigos install`. -- [X] open Odigos UI in your browser to interact with it. -- [X] see telemetry data that odigos generates, for example traces in jaeger. +- [x] run Odigos CLI in your terminal. +- [x] open the demo application UI in your browser to interact with it. +- [x] install odigos in your development cluster with `odigos install`. +- [x] open Odigos UI in your browser to interact with it. +- [x] see telemetry data that odigos generates, for example traces in jaeger. After you have a working odigos setup, you can start making changes to the code and test them locally. @@ -162,9 +162,9 @@ make deploy - Deploy a specific service by running one of the following commands: ```bash -make deploy-odiglet -make deploy-autoscaler -make deploy-collector +make deploy-odiglet +make deploy-autoscaler +make deploy-collector make deploy-scheduler make deploy-instrumentor make deploy-ui @@ -184,22 +184,7 @@ See the [Odigos docs](https://docs.odigos.io/intro) for the full steps on debugg ### How to Build and run Odigos Frontend Locally -Build the frontend - -```bash -cd frontend/webapp -yarn install -yarn build -yarn dev -cd ../.. # back to root of the project for next steps -``` - -Then run the web server - -```bash -cd frontend -go build -o odigos-backend && ./odigos-backend --port 8085 --debug --address 0.0.0.0 -``` +See the [Frontend README.md](https://github.com/odigos-io/odigos/blob/main/frontend/webapp/README.md) for the full steps. ## Odiglet diff --git a/frontend/graph/conversions.go b/frontend/graph/conversions.go index a138d45b68..6f3410f421 100644 --- a/frontend/graph/conversions.go +++ b/frontend/graph/conversions.go @@ -4,7 +4,6 @@ import ( "time" "github.com/odigos-io/odigos/api/odigos/v1alpha1" - "github.com/odigos-io/odigos/destinations" "github.com/odigos-io/odigos/frontend/graph/model" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) @@ -21,19 +20,6 @@ func k8sKindToGql(k8sResourceKind string) model.K8sResourceKind { return "" } -func k8sConditionStatusToGql(status v1.ConditionStatus) model.ConditionStatus { - switch status { - case v1.ConditionTrue: - return model.ConditionStatusTrue - case v1.ConditionFalse: - return model.ConditionStatusFalse - case v1.ConditionUnknown: - return model.ConditionStatusUnknown - } - return model.ConditionStatusUnknown - -} - // Convert LastTransitionTime to a string pointer if it's not nil func k8sLastTransitionTimeToGql(t v1.Time) *string { if t.IsZero() { @@ -85,18 +71,6 @@ func instrumentationConfigToActualSource(instruConfig v1alpha1.InstrumentationCo } } -func convertCustomReadDataLabels(labels []*destinations.CustomReadDataLabel) []*model.CustomReadDataLabel { - var result []*model.CustomReadDataLabel - for _, label := range labels { - result = append(result, &model.CustomReadDataLabel{ - Condition: label.Condition, - Title: label.Title, - Value: label.Value, - }) - } - return result -} - func convertConditions(conditions []v1.Condition) []*model.Condition { var result []*model.Condition for _, c := range conditions { diff --git a/frontend/graph/generated.go b/frontend/graph/generated.go index 9287e8088e..fd4fd876d9 100644 --- a/frontend/graph/generated.go +++ b/frontend/graph/generated.go @@ -40,7 +40,6 @@ type Config struct { type ResolverRoot interface { ComputePlatform() ComputePlatformResolver - Destination() DestinationResolver K8sActualNamespace() K8sActualNamespaceResolver Mutation() MutationResolver Query() QueryResolver @@ -158,7 +157,7 @@ type ComplexityRoot struct { DestinationType func(childComplexity int) int ExportedSignals func(childComplexity int) int Fields func(childComplexity int) int - Id func(childComplexity int) int + ID func(childComplexity int) int Name func(childComplexity int) int Type func(childComplexity int) int } @@ -169,17 +168,31 @@ type ComplexityRoot struct { URLString func(childComplexity int) int } + DestinationFieldYamlProperties struct { + ComponentProperties func(childComplexity int) int + ComponentType func(childComplexity int) int + CustomReadDataLabels func(childComplexity int) int + DisplayName func(childComplexity int) int + HideFromReadData func(childComplexity int) int + InitialValue func(childComplexity int) int + Name func(childComplexity int) int + RenderCondition func(childComplexity int) int + Secret func(childComplexity int) int + } + DestinationTypesCategoryItem struct { DisplayName func(childComplexity int) int - ImageUrl func(childComplexity int) int + Fields func(childComplexity int) int + ImageURL func(childComplexity int) int SupportedSignals func(childComplexity int) int TestConnectionSupported func(childComplexity int) int Type func(childComplexity int) int } DestinationsCategory struct { - Items func(childComplexity int) int - Name func(childComplexity int) int + Description func(childComplexity int) int + Items func(childComplexity int) int + Name func(childComplexity int) int } EntityProperty struct { @@ -205,28 +218,12 @@ type ComplexityRoot struct { Traces func(childComplexity int) int } - Field struct { - ComponentProperties func(childComplexity int) int - ComponentType func(childComplexity int) int - CustomReadDataLabels func(childComplexity int) int - DisplayName func(childComplexity int) int - HideFromReadData func(childComplexity int) int - InitialValue func(childComplexity int) int - Name func(childComplexity int) int - RenderCondition func(childComplexity int) int - Secret func(childComplexity int) int - } - GetConfigResponse struct { Installation func(childComplexity int) int Readonly func(childComplexity int) int } - GetDestinationDetailsResponse struct { - Fields func(childComplexity int) int - } - - GetDestinationTypesResponse struct { + GetDestinationCategories struct { Categories func(childComplexity int) int } @@ -417,14 +414,13 @@ type ComplexityRoot struct { } Query struct { - ComputePlatform func(childComplexity int) int - Config func(childComplexity int) int - DescribeOdigos func(childComplexity int) int - DescribeSource func(childComplexity int, namespace string, kind string, name string) int - DestinationTypeDetails func(childComplexity int, typeArg string) int - DestinationTypes func(childComplexity int) int - GetOverviewMetrics func(childComplexity int) int - PotentialDestinations func(childComplexity int) int + ComputePlatform func(childComplexity int) int + Config func(childComplexity int) int + DescribeOdigos func(childComplexity int) int + DescribeSource func(childComplexity int, namespace string, kind string, name string) int + DestinationCategories func(childComplexity int) int + GetOverviewMetrics func(childComplexity int) int + PotentialDestinations func(childComplexity int) int } RenameAttributeAction struct { @@ -501,11 +497,6 @@ type ComputePlatformResolver interface { Actions(ctx context.Context, obj *model.ComputePlatform) ([]*model.PipelineAction, error) InstrumentationRules(ctx context.Context, obj *model.ComputePlatform) ([]*model.InstrumentationRule, error) } -type DestinationResolver interface { - Type(ctx context.Context, obj *model.Destination) (string, error) - - Conditions(ctx context.Context, obj *model.Destination) ([]*model.Condition, error) -} type K8sActualNamespaceResolver interface { K8sActualSources(ctx context.Context, obj *model.K8sActualNamespace) ([]*model.K8sActualSource, error) } @@ -528,8 +519,7 @@ type MutationResolver interface { type QueryResolver interface { ComputePlatform(ctx context.Context) (*model.ComputePlatform, error) Config(ctx context.Context) (*model.GetConfigResponse, error) - DestinationTypes(ctx context.Context) (*model.GetDestinationTypesResponse, error) - DestinationTypeDetails(ctx context.Context, typeArg string) (*model.GetDestinationDetailsResponse, error) + DestinationCategories(ctx context.Context) (*model.GetDestinationCategories, error) PotentialDestinations(ctx context.Context) ([]*model.DestinationDetails, error) GetOverviewMetrics(ctx context.Context) (*model.OverviewMetricsResponse, error) DescribeOdigos(ctx context.Context) (*model.OdigosAnalyze, error) @@ -1042,11 +1032,11 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in return e.complexity.Destination.Fields(childComplexity), true case "Destination.id": - if e.complexity.Destination.Id == nil { + if e.complexity.Destination.ID == nil { break } - return e.complexity.Destination.Id(childComplexity), true + return e.complexity.Destination.ID(childComplexity), true case "Destination.name": if e.complexity.Destination.Name == nil { @@ -1083,6 +1073,69 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in return e.complexity.DestinationDetails.URLString(childComplexity), true + case "DestinationFieldYamlProperties.componentProperties": + if e.complexity.DestinationFieldYamlProperties.ComponentProperties == nil { + break + } + + return e.complexity.DestinationFieldYamlProperties.ComponentProperties(childComplexity), true + + case "DestinationFieldYamlProperties.componentType": + if e.complexity.DestinationFieldYamlProperties.ComponentType == nil { + break + } + + return e.complexity.DestinationFieldYamlProperties.ComponentType(childComplexity), true + + case "DestinationFieldYamlProperties.customReadDataLabels": + if e.complexity.DestinationFieldYamlProperties.CustomReadDataLabels == nil { + break + } + + return e.complexity.DestinationFieldYamlProperties.CustomReadDataLabels(childComplexity), true + + case "DestinationFieldYamlProperties.displayName": + if e.complexity.DestinationFieldYamlProperties.DisplayName == nil { + break + } + + return e.complexity.DestinationFieldYamlProperties.DisplayName(childComplexity), true + + case "DestinationFieldYamlProperties.hideFromReadData": + if e.complexity.DestinationFieldYamlProperties.HideFromReadData == nil { + break + } + + return e.complexity.DestinationFieldYamlProperties.HideFromReadData(childComplexity), true + + case "DestinationFieldYamlProperties.initialValue": + if e.complexity.DestinationFieldYamlProperties.InitialValue == nil { + break + } + + return e.complexity.DestinationFieldYamlProperties.InitialValue(childComplexity), true + + case "DestinationFieldYamlProperties.name": + if e.complexity.DestinationFieldYamlProperties.Name == nil { + break + } + + return e.complexity.DestinationFieldYamlProperties.Name(childComplexity), true + + case "DestinationFieldYamlProperties.renderCondition": + if e.complexity.DestinationFieldYamlProperties.RenderCondition == nil { + break + } + + return e.complexity.DestinationFieldYamlProperties.RenderCondition(childComplexity), true + + case "DestinationFieldYamlProperties.secret": + if e.complexity.DestinationFieldYamlProperties.Secret == nil { + break + } + + return e.complexity.DestinationFieldYamlProperties.Secret(childComplexity), true + case "DestinationTypesCategoryItem.displayName": if e.complexity.DestinationTypesCategoryItem.DisplayName == nil { break @@ -1090,12 +1143,19 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in return e.complexity.DestinationTypesCategoryItem.DisplayName(childComplexity), true + case "DestinationTypesCategoryItem.fields": + if e.complexity.DestinationTypesCategoryItem.Fields == nil { + break + } + + return e.complexity.DestinationTypesCategoryItem.Fields(childComplexity), true + case "DestinationTypesCategoryItem.imageUrl": - if e.complexity.DestinationTypesCategoryItem.ImageUrl == nil { + if e.complexity.DestinationTypesCategoryItem.ImageURL == nil { break } - return e.complexity.DestinationTypesCategoryItem.ImageUrl(childComplexity), true + return e.complexity.DestinationTypesCategoryItem.ImageURL(childComplexity), true case "DestinationTypesCategoryItem.supportedSignals": if e.complexity.DestinationTypesCategoryItem.SupportedSignals == nil { @@ -1118,6 +1178,13 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in return e.complexity.DestinationTypesCategoryItem.Type(childComplexity), true + case "DestinationsCategory.description": + if e.complexity.DestinationsCategory.Description == nil { + break + } + + return e.complexity.DestinationsCategory.Description(childComplexity), true + case "DestinationsCategory.items": if e.complexity.DestinationsCategory.Items == nil { break @@ -1230,69 +1297,6 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in return e.complexity.ExportedSignals.Traces(childComplexity), true - case "Field.componentProperties": - if e.complexity.Field.ComponentProperties == nil { - break - } - - return e.complexity.Field.ComponentProperties(childComplexity), true - - case "Field.componentType": - if e.complexity.Field.ComponentType == nil { - break - } - - return e.complexity.Field.ComponentType(childComplexity), true - - case "Field.customReadDataLabels": - if e.complexity.Field.CustomReadDataLabels == nil { - break - } - - return e.complexity.Field.CustomReadDataLabels(childComplexity), true - - case "Field.displayName": - if e.complexity.Field.DisplayName == nil { - break - } - - return e.complexity.Field.DisplayName(childComplexity), true - - case "Field.hideFromReadData": - if e.complexity.Field.HideFromReadData == nil { - break - } - - return e.complexity.Field.HideFromReadData(childComplexity), true - - case "Field.initialValue": - if e.complexity.Field.InitialValue == nil { - break - } - - return e.complexity.Field.InitialValue(childComplexity), true - - case "Field.name": - if e.complexity.Field.Name == nil { - break - } - - return e.complexity.Field.Name(childComplexity), true - - case "Field.renderCondition": - if e.complexity.Field.RenderCondition == nil { - break - } - - return e.complexity.Field.RenderCondition(childComplexity), true - - case "Field.secret": - if e.complexity.Field.Secret == nil { - break - } - - return e.complexity.Field.Secret(childComplexity), true - case "GetConfigResponse.installation": if e.complexity.GetConfigResponse.Installation == nil { break @@ -1307,19 +1311,12 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in return e.complexity.GetConfigResponse.Readonly(childComplexity), true - case "GetDestinationDetailsResponse.fields": - if e.complexity.GetDestinationDetailsResponse.Fields == nil { - break - } - - return e.complexity.GetDestinationDetailsResponse.Fields(childComplexity), true - - case "GetDestinationTypesResponse.categories": - if e.complexity.GetDestinationTypesResponse.Categories == nil { + case "GetDestinationCategories.categories": + if e.complexity.GetDestinationCategories.Categories == nil { break } - return e.complexity.GetDestinationTypesResponse.Categories(childComplexity), true + return e.complexity.GetDestinationCategories.Categories(childComplexity), true case "HttpPayloadCollection.dropPartialPayloads": if e.complexity.HttpPayloadCollection.DropPartialPayloads == nil { @@ -2243,24 +2240,12 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in return e.complexity.Query.DescribeSource(childComplexity, args["namespace"].(string), args["kind"].(string), args["name"].(string)), true - case "Query.destinationTypeDetails": - if e.complexity.Query.DestinationTypeDetails == nil { - break - } - - args, err := ec.field_Query_destinationTypeDetails_args(context.TODO(), rawArgs) - if err != nil { - return 0, false - } - - return e.complexity.Query.DestinationTypeDetails(childComplexity, args["type"].(string)), true - - case "Query.destinationTypes": - if e.complexity.Query.DestinationTypes == nil { + case "Query.destinationCategories": + if e.complexity.Query.DestinationCategories == nil { break } - return e.complexity.Query.DestinationTypes(childComplexity), true + return e.complexity.Query.DestinationCategories(childComplexity), true case "Query.getOverviewMetrics": if e.complexity.Query.GetOverviewMetrics == nil { @@ -3041,21 +3026,6 @@ func (ec *executionContext) field_Query_describeSource_args(ctx context.Context, return args, nil } -func (ec *executionContext) field_Query_destinationTypeDetails_args(ctx context.Context, rawArgs map[string]interface{}) (map[string]interface{}, error) { - var err error - args := map[string]interface{}{} - var arg0 string - if tmp, ok := rawArgs["type"]; ok { - ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("type")) - arg0, err = ec.unmarshalNString2string(ctx, tmp) - if err != nil { - return nil, err - } - } - args["type"] = arg0 - return args, nil -} - func (ec *executionContext) field___Type_enumValues_args(ctx context.Context, rawArgs map[string]interface{}) (map[string]interface{}, error) { var err error args := map[string]interface{}{} @@ -6141,7 +6111,7 @@ func (ec *executionContext) _Destination_id(ctx context.Context, field graphql.C }() resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) { ctx = rctx // use context from middleware stack in children - return obj.Id, nil + return obj.ID, nil }) if err != nil { ec.Error(ctx, err) @@ -6229,7 +6199,7 @@ func (ec *executionContext) _Destination_type(ctx context.Context, field graphql }() resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) { ctx = rctx // use context from middleware stack in children - return ec.resolvers.Destination().Type(rctx, obj) + return obj.Type, nil }) if err != nil { ec.Error(ctx, err) @@ -6250,8 +6220,8 @@ func (ec *executionContext) fieldContext_Destination_type(_ context.Context, fie fc = &graphql.FieldContext{ Object: "Destination", Field: field, - IsMethod: true, - IsResolver: true, + IsMethod: false, + IsResolver: false, Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { return nil, errors.New("field of type String does not have child fields") }, @@ -6285,9 +6255,9 @@ func (ec *executionContext) _Destination_exportedSignals(ctx context.Context, fi } return graphql.Null } - res := resTmp.(model.ExportedSignals) + res := resTmp.(*model.ExportedSignals) fc.Result = res - return ec.marshalNExportedSignals2githubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐExportedSignals(ctx, field.Selections, res) + return ec.marshalNExportedSignals2ᚖgithubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐExportedSignals(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Destination_exportedSignals(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -6381,9 +6351,9 @@ func (ec *executionContext) _Destination_destinationType(ctx context.Context, fi } return graphql.Null } - res := resTmp.(model.DestinationTypesCategoryItem) + res := resTmp.(*model.DestinationTypesCategoryItem) fc.Result = res - return ec.marshalNDestinationTypesCategoryItem2githubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐDestinationTypesCategoryItem(ctx, field.Selections, res) + return ec.marshalNDestinationTypesCategoryItem2ᚖgithubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐDestinationTypesCategoryItem(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Destination_destinationType(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -6404,6 +6374,8 @@ func (ec *executionContext) fieldContext_Destination_destinationType(_ context.C return ec.fieldContext_DestinationTypesCategoryItem_supportedSignals(ctx, field) case "testConnectionSupported": return ec.fieldContext_DestinationTypesCategoryItem_testConnectionSupported(ctx, field) + case "fields": + return ec.fieldContext_DestinationTypesCategoryItem_fields(ctx, field) } return nil, fmt.Errorf("no field named %q was found under type DestinationTypesCategoryItem", field.Name) }, @@ -6425,7 +6397,7 @@ func (ec *executionContext) _Destination_conditions(ctx context.Context, field g }() resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) { ctx = rctx // use context from middleware stack in children - return ec.resolvers.Destination().Conditions(rctx, obj) + return obj.Conditions, nil }) if err != nil { ec.Error(ctx, err) @@ -6443,8 +6415,8 @@ func (ec *executionContext) fieldContext_Destination_conditions(_ context.Contex fc = &graphql.FieldContext{ Object: "Destination", Field: field, - IsMethod: true, - IsResolver: true, + IsMethod: false, + IsResolver: false, Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { switch field.Name { case "status": @@ -6596,8 +6568,8 @@ func (ec *executionContext) fieldContext_DestinationDetails_fields(_ context.Con return fc, nil } -func (ec *executionContext) _DestinationTypesCategoryItem_type(ctx context.Context, field graphql.CollectedField, obj *model.DestinationTypesCategoryItem) (ret graphql.Marshaler) { - fc, err := ec.fieldContext_DestinationTypesCategoryItem_type(ctx, field) +func (ec *executionContext) _DestinationFieldYamlProperties_name(ctx context.Context, field graphql.CollectedField, obj *model.DestinationFieldYamlProperties) (ret graphql.Marshaler) { + fc, err := ec.fieldContext_DestinationFieldYamlProperties_name(ctx, field) if err != nil { return graphql.Null } @@ -6610,7 +6582,7 @@ func (ec *executionContext) _DestinationTypesCategoryItem_type(ctx context.Conte }() resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) { ctx = rctx // use context from middleware stack in children - return obj.Type, nil + return obj.Name, nil }) if err != nil { ec.Error(ctx, err) @@ -6627,9 +6599,9 @@ func (ec *executionContext) _DestinationTypesCategoryItem_type(ctx context.Conte return ec.marshalNString2string(ctx, field.Selections, res) } -func (ec *executionContext) fieldContext_DestinationTypesCategoryItem_type(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { +func (ec *executionContext) fieldContext_DestinationFieldYamlProperties_name(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { fc = &graphql.FieldContext{ - Object: "DestinationTypesCategoryItem", + Object: "DestinationFieldYamlProperties", Field: field, IsMethod: false, IsResolver: false, @@ -6640,8 +6612,8 @@ func (ec *executionContext) fieldContext_DestinationTypesCategoryItem_type(_ con return fc, nil } -func (ec *executionContext) _DestinationTypesCategoryItem_displayName(ctx context.Context, field graphql.CollectedField, obj *model.DestinationTypesCategoryItem) (ret graphql.Marshaler) { - fc, err := ec.fieldContext_DestinationTypesCategoryItem_displayName(ctx, field) +func (ec *executionContext) _DestinationFieldYamlProperties_displayName(ctx context.Context, field graphql.CollectedField, obj *model.DestinationFieldYamlProperties) (ret graphql.Marshaler) { + fc, err := ec.fieldContext_DestinationFieldYamlProperties_displayName(ctx, field) if err != nil { return graphql.Null } @@ -6671,9 +6643,9 @@ func (ec *executionContext) _DestinationTypesCategoryItem_displayName(ctx contex return ec.marshalNString2string(ctx, field.Selections, res) } -func (ec *executionContext) fieldContext_DestinationTypesCategoryItem_displayName(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { +func (ec *executionContext) fieldContext_DestinationFieldYamlProperties_displayName(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { fc = &graphql.FieldContext{ - Object: "DestinationTypesCategoryItem", + Object: "DestinationFieldYamlProperties", Field: field, IsMethod: false, IsResolver: false, @@ -6684,8 +6656,8 @@ func (ec *executionContext) fieldContext_DestinationTypesCategoryItem_displayNam return fc, nil } -func (ec *executionContext) _DestinationTypesCategoryItem_imageUrl(ctx context.Context, field graphql.CollectedField, obj *model.DestinationTypesCategoryItem) (ret graphql.Marshaler) { - fc, err := ec.fieldContext_DestinationTypesCategoryItem_imageUrl(ctx, field) +func (ec *executionContext) _DestinationFieldYamlProperties_componentType(ctx context.Context, field graphql.CollectedField, obj *model.DestinationFieldYamlProperties) (ret graphql.Marshaler) { + fc, err := ec.fieldContext_DestinationFieldYamlProperties_componentType(ctx, field) if err != nil { return graphql.Null } @@ -6698,7 +6670,7 @@ func (ec *executionContext) _DestinationTypesCategoryItem_imageUrl(ctx context.C }() resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) { ctx = rctx // use context from middleware stack in children - return obj.ImageUrl, nil + return obj.ComponentType, nil }) if err != nil { ec.Error(ctx, err) @@ -6715,9 +6687,9 @@ func (ec *executionContext) _DestinationTypesCategoryItem_imageUrl(ctx context.C return ec.marshalNString2string(ctx, field.Selections, res) } -func (ec *executionContext) fieldContext_DestinationTypesCategoryItem_imageUrl(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { +func (ec *executionContext) fieldContext_DestinationFieldYamlProperties_componentType(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { fc = &graphql.FieldContext{ - Object: "DestinationTypesCategoryItem", + Object: "DestinationFieldYamlProperties", Field: field, IsMethod: false, IsResolver: false, @@ -6728,8 +6700,8 @@ func (ec *executionContext) fieldContext_DestinationTypesCategoryItem_imageUrl(_ return fc, nil } -func (ec *executionContext) _DestinationTypesCategoryItem_supportedSignals(ctx context.Context, field graphql.CollectedField, obj *model.DestinationTypesCategoryItem) (ret graphql.Marshaler) { - fc, err := ec.fieldContext_DestinationTypesCategoryItem_supportedSignals(ctx, field) +func (ec *executionContext) _DestinationFieldYamlProperties_componentProperties(ctx context.Context, field graphql.CollectedField, obj *model.DestinationFieldYamlProperties) (ret graphql.Marshaler) { + fc, err := ec.fieldContext_DestinationFieldYamlProperties_componentProperties(ctx, field) if err != nil { return graphql.Null } @@ -6742,7 +6714,7 @@ func (ec *executionContext) _DestinationTypesCategoryItem_supportedSignals(ctx c }() resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) { ctx = rctx // use context from middleware stack in children - return obj.SupportedSignals, nil + return obj.ComponentProperties, nil }) if err != nil { ec.Error(ctx, err) @@ -6754,34 +6726,26 @@ func (ec *executionContext) _DestinationTypesCategoryItem_supportedSignals(ctx c } return graphql.Null } - res := resTmp.(model.SupportedSignals) + res := resTmp.(string) fc.Result = res - return ec.marshalNSupportedSignals2githubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐSupportedSignals(ctx, field.Selections, res) + return ec.marshalNString2string(ctx, field.Selections, res) } -func (ec *executionContext) fieldContext_DestinationTypesCategoryItem_supportedSignals(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { +func (ec *executionContext) fieldContext_DestinationFieldYamlProperties_componentProperties(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { fc = &graphql.FieldContext{ - Object: "DestinationTypesCategoryItem", + Object: "DestinationFieldYamlProperties", Field: field, IsMethod: false, IsResolver: false, Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - switch field.Name { - case "traces": - return ec.fieldContext_SupportedSignals_traces(ctx, field) - case "metrics": - return ec.fieldContext_SupportedSignals_metrics(ctx, field) - case "logs": - return ec.fieldContext_SupportedSignals_logs(ctx, field) - } - return nil, fmt.Errorf("no field named %q was found under type SupportedSignals", field.Name) + return nil, errors.New("field of type String does not have child fields") }, } return fc, nil } -func (ec *executionContext) _DestinationTypesCategoryItem_testConnectionSupported(ctx context.Context, field graphql.CollectedField, obj *model.DestinationTypesCategoryItem) (ret graphql.Marshaler) { - fc, err := ec.fieldContext_DestinationTypesCategoryItem_testConnectionSupported(ctx, field) +func (ec *executionContext) _DestinationFieldYamlProperties_secret(ctx context.Context, field graphql.CollectedField, obj *model.DestinationFieldYamlProperties) (ret graphql.Marshaler) { + fc, err := ec.fieldContext_DestinationFieldYamlProperties_secret(ctx, field) if err != nil { return graphql.Null } @@ -6794,7 +6758,7 @@ func (ec *executionContext) _DestinationTypesCategoryItem_testConnectionSupporte }() resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) { ctx = rctx // use context from middleware stack in children - return obj.TestConnectionSupported, nil + return obj.Secret, nil }) if err != nil { ec.Error(ctx, err) @@ -6811,9 +6775,9 @@ func (ec *executionContext) _DestinationTypesCategoryItem_testConnectionSupporte return ec.marshalNBoolean2bool(ctx, field.Selections, res) } -func (ec *executionContext) fieldContext_DestinationTypesCategoryItem_testConnectionSupported(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { +func (ec *executionContext) fieldContext_DestinationFieldYamlProperties_secret(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { fc = &graphql.FieldContext{ - Object: "DestinationTypesCategoryItem", + Object: "DestinationFieldYamlProperties", Field: field, IsMethod: false, IsResolver: false, @@ -6824,8 +6788,8 @@ func (ec *executionContext) fieldContext_DestinationTypesCategoryItem_testConnec return fc, nil } -func (ec *executionContext) _DestinationsCategory_name(ctx context.Context, field graphql.CollectedField, obj *model.DestinationsCategory) (ret graphql.Marshaler) { - fc, err := ec.fieldContext_DestinationsCategory_name(ctx, field) +func (ec *executionContext) _DestinationFieldYamlProperties_initialValue(ctx context.Context, field graphql.CollectedField, obj *model.DestinationFieldYamlProperties) (ret graphql.Marshaler) { + fc, err := ec.fieldContext_DestinationFieldYamlProperties_initialValue(ctx, field) if err != nil { return graphql.Null } @@ -6838,7 +6802,7 @@ func (ec *executionContext) _DestinationsCategory_name(ctx context.Context, fiel }() resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) { ctx = rctx // use context from middleware stack in children - return obj.Name, nil + return obj.InitialValue, nil }) if err != nil { ec.Error(ctx, err) @@ -6855,9 +6819,9 @@ func (ec *executionContext) _DestinationsCategory_name(ctx context.Context, fiel return ec.marshalNString2string(ctx, field.Selections, res) } -func (ec *executionContext) fieldContext_DestinationsCategory_name(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { +func (ec *executionContext) fieldContext_DestinationFieldYamlProperties_initialValue(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { fc = &graphql.FieldContext{ - Object: "DestinationsCategory", + Object: "DestinationFieldYamlProperties", Field: field, IsMethod: false, IsResolver: false, @@ -6868,8 +6832,8 @@ func (ec *executionContext) fieldContext_DestinationsCategory_name(_ context.Con return fc, nil } -func (ec *executionContext) _DestinationsCategory_items(ctx context.Context, field graphql.CollectedField, obj *model.DestinationsCategory) (ret graphql.Marshaler) { - fc, err := ec.fieldContext_DestinationsCategory_items(ctx, field) +func (ec *executionContext) _DestinationFieldYamlProperties_renderCondition(ctx context.Context, field graphql.CollectedField, obj *model.DestinationFieldYamlProperties) (ret graphql.Marshaler) { + fc, err := ec.fieldContext_DestinationFieldYamlProperties_renderCondition(ctx, field) if err != nil { return graphql.Null } @@ -6882,7 +6846,7 @@ func (ec *executionContext) _DestinationsCategory_items(ctx context.Context, fie }() resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) { ctx = rctx // use context from middleware stack in children - return obj.Items, nil + return obj.RenderCondition, nil }) if err != nil { ec.Error(ctx, err) @@ -6894,38 +6858,26 @@ func (ec *executionContext) _DestinationsCategory_items(ctx context.Context, fie } return graphql.Null } - res := resTmp.([]model.DestinationTypesCategoryItem) + res := resTmp.([]string) fc.Result = res - return ec.marshalNDestinationTypesCategoryItem2ᚕgithubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐDestinationTypesCategoryItemᚄ(ctx, field.Selections, res) + return ec.marshalNString2ᚕstringᚄ(ctx, field.Selections, res) } -func (ec *executionContext) fieldContext_DestinationsCategory_items(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { +func (ec *executionContext) fieldContext_DestinationFieldYamlProperties_renderCondition(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { fc = &graphql.FieldContext{ - Object: "DestinationsCategory", + Object: "DestinationFieldYamlProperties", Field: field, IsMethod: false, IsResolver: false, Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - switch field.Name { - case "type": - return ec.fieldContext_DestinationTypesCategoryItem_type(ctx, field) - case "displayName": - return ec.fieldContext_DestinationTypesCategoryItem_displayName(ctx, field) - case "imageUrl": - return ec.fieldContext_DestinationTypesCategoryItem_imageUrl(ctx, field) - case "supportedSignals": - return ec.fieldContext_DestinationTypesCategoryItem_supportedSignals(ctx, field) - case "testConnectionSupported": - return ec.fieldContext_DestinationTypesCategoryItem_testConnectionSupported(ctx, field) - } - return nil, fmt.Errorf("no field named %q was found under type DestinationTypesCategoryItem", field.Name) + return nil, errors.New("field of type String does not have child fields") }, } return fc, nil } -func (ec *executionContext) _EntityProperty_name(ctx context.Context, field graphql.CollectedField, obj *model.EntityProperty) (ret graphql.Marshaler) { - fc, err := ec.fieldContext_EntityProperty_name(ctx, field) +func (ec *executionContext) _DestinationFieldYamlProperties_hideFromReadData(ctx context.Context, field graphql.CollectedField, obj *model.DestinationFieldYamlProperties) (ret graphql.Marshaler) { + fc, err := ec.fieldContext_DestinationFieldYamlProperties_hideFromReadData(ctx, field) if err != nil { return graphql.Null } @@ -6938,7 +6890,7 @@ func (ec *executionContext) _EntityProperty_name(ctx context.Context, field grap }() resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) { ctx = rctx // use context from middleware stack in children - return obj.Name, nil + return obj.HideFromReadData, nil }) if err != nil { ec.Error(ctx, err) @@ -6950,14 +6902,14 @@ func (ec *executionContext) _EntityProperty_name(ctx context.Context, field grap } return graphql.Null } - res := resTmp.(string) + res := resTmp.([]string) fc.Result = res - return ec.marshalNString2string(ctx, field.Selections, res) + return ec.marshalNString2ᚕstringᚄ(ctx, field.Selections, res) } -func (ec *executionContext) fieldContext_EntityProperty_name(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { +func (ec *executionContext) fieldContext_DestinationFieldYamlProperties_hideFromReadData(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { fc = &graphql.FieldContext{ - Object: "EntityProperty", + Object: "DestinationFieldYamlProperties", Field: field, IsMethod: false, IsResolver: false, @@ -6968,8 +6920,8 @@ func (ec *executionContext) fieldContext_EntityProperty_name(_ context.Context, return fc, nil } -func (ec *executionContext) _EntityProperty_value(ctx context.Context, field graphql.CollectedField, obj *model.EntityProperty) (ret graphql.Marshaler) { - fc, err := ec.fieldContext_EntityProperty_value(ctx, field) +func (ec *executionContext) _DestinationFieldYamlProperties_customReadDataLabels(ctx context.Context, field graphql.CollectedField, obj *model.DestinationFieldYamlProperties) (ret graphql.Marshaler) { + fc, err := ec.fieldContext_DestinationFieldYamlProperties_customReadDataLabels(ctx, field) if err != nil { return graphql.Null } @@ -6982,7 +6934,7 @@ func (ec *executionContext) _EntityProperty_value(ctx context.Context, field gra }() resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) { ctx = rctx // use context from middleware stack in children - return obj.Value, nil + return obj.CustomReadDataLabels, nil }) if err != nil { ec.Error(ctx, err) @@ -6994,26 +6946,34 @@ func (ec *executionContext) _EntityProperty_value(ctx context.Context, field gra } return graphql.Null } - res := resTmp.(string) + res := resTmp.([]*model.CustomReadDataLabel) fc.Result = res - return ec.marshalNString2string(ctx, field.Selections, res) + return ec.marshalNCustomReadDataLabel2ᚕᚖgithubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐCustomReadDataLabelᚄ(ctx, field.Selections, res) } -func (ec *executionContext) fieldContext_EntityProperty_value(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { +func (ec *executionContext) fieldContext_DestinationFieldYamlProperties_customReadDataLabels(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { fc = &graphql.FieldContext{ - Object: "EntityProperty", + Object: "DestinationFieldYamlProperties", Field: field, IsMethod: false, IsResolver: false, Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - return nil, errors.New("field of type String does not have child fields") + switch field.Name { + case "condition": + return ec.fieldContext_CustomReadDataLabel_condition(ctx, field) + case "title": + return ec.fieldContext_CustomReadDataLabel_title(ctx, field) + case "value": + return ec.fieldContext_CustomReadDataLabel_value(ctx, field) + } + return nil, fmt.Errorf("no field named %q was found under type CustomReadDataLabel", field.Name) }, } return fc, nil } -func (ec *executionContext) _EntityProperty_status(ctx context.Context, field graphql.CollectedField, obj *model.EntityProperty) (ret graphql.Marshaler) { - fc, err := ec.fieldContext_EntityProperty_status(ctx, field) +func (ec *executionContext) _DestinationTypesCategoryItem_type(ctx context.Context, field graphql.CollectedField, obj *model.DestinationTypesCategoryItem) (ret graphql.Marshaler) { + fc, err := ec.fieldContext_DestinationTypesCategoryItem_type(ctx, field) if err != nil { return graphql.Null } @@ -7026,23 +6986,26 @@ func (ec *executionContext) _EntityProperty_status(ctx context.Context, field gr }() resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) { ctx = rctx // use context from middleware stack in children - return obj.Status, nil + return obj.Type, nil }) if err != nil { ec.Error(ctx, err) return graphql.Null } if resTmp == nil { + if !graphql.HasFieldError(ctx, fc) { + ec.Errorf(ctx, "must not be null") + } return graphql.Null } - res := resTmp.(*string) + res := resTmp.(string) fc.Result = res - return ec.marshalOString2ᚖstring(ctx, field.Selections, res) + return ec.marshalNString2string(ctx, field.Selections, res) } -func (ec *executionContext) fieldContext_EntityProperty_status(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { +func (ec *executionContext) fieldContext_DestinationTypesCategoryItem_type(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { fc = &graphql.FieldContext{ - Object: "EntityProperty", + Object: "DestinationTypesCategoryItem", Field: field, IsMethod: false, IsResolver: false, @@ -7053,8 +7016,8 @@ func (ec *executionContext) fieldContext_EntityProperty_status(_ context.Context return fc, nil } -func (ec *executionContext) _EntityProperty_explain(ctx context.Context, field graphql.CollectedField, obj *model.EntityProperty) (ret graphql.Marshaler) { - fc, err := ec.fieldContext_EntityProperty_explain(ctx, field) +func (ec *executionContext) _DestinationTypesCategoryItem_displayName(ctx context.Context, field graphql.CollectedField, obj *model.DestinationTypesCategoryItem) (ret graphql.Marshaler) { + fc, err := ec.fieldContext_DestinationTypesCategoryItem_displayName(ctx, field) if err != nil { return graphql.Null } @@ -7067,23 +7030,26 @@ func (ec *executionContext) _EntityProperty_explain(ctx context.Context, field g }() resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) { ctx = rctx // use context from middleware stack in children - return obj.Explain, nil + return obj.DisplayName, nil }) if err != nil { ec.Error(ctx, err) return graphql.Null } if resTmp == nil { + if !graphql.HasFieldError(ctx, fc) { + ec.Errorf(ctx, "must not be null") + } return graphql.Null } - res := resTmp.(*string) + res := resTmp.(string) fc.Result = res - return ec.marshalOString2ᚖstring(ctx, field.Selections, res) + return ec.marshalNString2string(ctx, field.Selections, res) } -func (ec *executionContext) fieldContext_EntityProperty_explain(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { +func (ec *executionContext) fieldContext_DestinationTypesCategoryItem_displayName(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { fc = &graphql.FieldContext{ - Object: "EntityProperty", + Object: "DestinationTypesCategoryItem", Field: field, IsMethod: false, IsResolver: false, @@ -7094,8 +7060,8 @@ func (ec *executionContext) fieldContext_EntityProperty_explain(_ context.Contex return fc, nil } -func (ec *executionContext) _ErrorSamplerAction_id(ctx context.Context, field graphql.CollectedField, obj *model.ErrorSamplerAction) (ret graphql.Marshaler) { - fc, err := ec.fieldContext_ErrorSamplerAction_id(ctx, field) +func (ec *executionContext) _DestinationTypesCategoryItem_imageUrl(ctx context.Context, field graphql.CollectedField, obj *model.DestinationTypesCategoryItem) (ret graphql.Marshaler) { + fc, err := ec.fieldContext_DestinationTypesCategoryItem_imageUrl(ctx, field) if err != nil { return graphql.Null } @@ -7108,7 +7074,7 @@ func (ec *executionContext) _ErrorSamplerAction_id(ctx context.Context, field gr }() resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) { ctx = rctx // use context from middleware stack in children - return obj.ID, nil + return obj.ImageURL, nil }) if err != nil { ec.Error(ctx, err) @@ -7122,24 +7088,24 @@ func (ec *executionContext) _ErrorSamplerAction_id(ctx context.Context, field gr } res := resTmp.(string) fc.Result = res - return ec.marshalNID2string(ctx, field.Selections, res) + return ec.marshalNString2string(ctx, field.Selections, res) } -func (ec *executionContext) fieldContext_ErrorSamplerAction_id(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { +func (ec *executionContext) fieldContext_DestinationTypesCategoryItem_imageUrl(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { fc = &graphql.FieldContext{ - Object: "ErrorSamplerAction", + Object: "DestinationTypesCategoryItem", Field: field, IsMethod: false, IsResolver: false, Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - return nil, errors.New("field of type ID does not have child fields") + return nil, errors.New("field of type String does not have child fields") }, } return fc, nil } -func (ec *executionContext) _ErrorSamplerAction_type(ctx context.Context, field graphql.CollectedField, obj *model.ErrorSamplerAction) (ret graphql.Marshaler) { - fc, err := ec.fieldContext_ErrorSamplerAction_type(ctx, field) +func (ec *executionContext) _DestinationTypesCategoryItem_supportedSignals(ctx context.Context, field graphql.CollectedField, obj *model.DestinationTypesCategoryItem) (ret graphql.Marshaler) { + fc, err := ec.fieldContext_DestinationTypesCategoryItem_supportedSignals(ctx, field) if err != nil { return graphql.Null } @@ -7152,7 +7118,7 @@ func (ec *executionContext) _ErrorSamplerAction_type(ctx context.Context, field }() resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) { ctx = rctx // use context from middleware stack in children - return obj.Type, nil + return obj.SupportedSignals, nil }) if err != nil { ec.Error(ctx, err) @@ -7164,26 +7130,34 @@ func (ec *executionContext) _ErrorSamplerAction_type(ctx context.Context, field } return graphql.Null } - res := resTmp.(string) + res := resTmp.(*model.SupportedSignals) fc.Result = res - return ec.marshalNString2string(ctx, field.Selections, res) + return ec.marshalNSupportedSignals2ᚖgithubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐSupportedSignals(ctx, field.Selections, res) } -func (ec *executionContext) fieldContext_ErrorSamplerAction_type(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { +func (ec *executionContext) fieldContext_DestinationTypesCategoryItem_supportedSignals(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { fc = &graphql.FieldContext{ - Object: "ErrorSamplerAction", + Object: "DestinationTypesCategoryItem", Field: field, IsMethod: false, IsResolver: false, Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - return nil, errors.New("field of type String does not have child fields") + switch field.Name { + case "traces": + return ec.fieldContext_SupportedSignals_traces(ctx, field) + case "metrics": + return ec.fieldContext_SupportedSignals_metrics(ctx, field) + case "logs": + return ec.fieldContext_SupportedSignals_logs(ctx, field) + } + return nil, fmt.Errorf("no field named %q was found under type SupportedSignals", field.Name) }, } return fc, nil } -func (ec *executionContext) _ErrorSamplerAction_name(ctx context.Context, field graphql.CollectedField, obj *model.ErrorSamplerAction) (ret graphql.Marshaler) { - fc, err := ec.fieldContext_ErrorSamplerAction_name(ctx, field) +func (ec *executionContext) _DestinationTypesCategoryItem_testConnectionSupported(ctx context.Context, field graphql.CollectedField, obj *model.DestinationTypesCategoryItem) (ret graphql.Marshaler) { + fc, err := ec.fieldContext_DestinationTypesCategoryItem_testConnectionSupported(ctx, field) if err != nil { return graphql.Null } @@ -7196,35 +7170,38 @@ func (ec *executionContext) _ErrorSamplerAction_name(ctx context.Context, field }() resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) { ctx = rctx // use context from middleware stack in children - return obj.Name, nil + return obj.TestConnectionSupported, nil }) if err != nil { ec.Error(ctx, err) return graphql.Null } if resTmp == nil { + if !graphql.HasFieldError(ctx, fc) { + ec.Errorf(ctx, "must not be null") + } return graphql.Null } - res := resTmp.(*string) + res := resTmp.(bool) fc.Result = res - return ec.marshalOString2ᚖstring(ctx, field.Selections, res) + return ec.marshalNBoolean2bool(ctx, field.Selections, res) } -func (ec *executionContext) fieldContext_ErrorSamplerAction_name(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { +func (ec *executionContext) fieldContext_DestinationTypesCategoryItem_testConnectionSupported(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { fc = &graphql.FieldContext{ - Object: "ErrorSamplerAction", + Object: "DestinationTypesCategoryItem", Field: field, IsMethod: false, IsResolver: false, Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - return nil, errors.New("field of type String does not have child fields") + return nil, errors.New("field of type Boolean does not have child fields") }, } return fc, nil } -func (ec *executionContext) _ErrorSamplerAction_notes(ctx context.Context, field graphql.CollectedField, obj *model.ErrorSamplerAction) (ret graphql.Marshaler) { - fc, err := ec.fieldContext_ErrorSamplerAction_notes(ctx, field) +func (ec *executionContext) _DestinationTypesCategoryItem_fields(ctx context.Context, field graphql.CollectedField, obj *model.DestinationTypesCategoryItem) (ret graphql.Marshaler) { + fc, err := ec.fieldContext_DestinationTypesCategoryItem_fields(ctx, field) if err != nil { return graphql.Null } @@ -7237,35 +7214,58 @@ func (ec *executionContext) _ErrorSamplerAction_notes(ctx context.Context, field }() resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) { ctx = rctx // use context from middleware stack in children - return obj.Notes, nil + return obj.Fields, nil }) if err != nil { ec.Error(ctx, err) return graphql.Null } if resTmp == nil { + if !graphql.HasFieldError(ctx, fc) { + ec.Errorf(ctx, "must not be null") + } return graphql.Null } - res := resTmp.(*string) + res := resTmp.([]*model.DestinationFieldYamlProperties) fc.Result = res - return ec.marshalOString2ᚖstring(ctx, field.Selections, res) + return ec.marshalNDestinationFieldYamlProperties2ᚕᚖgithubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐDestinationFieldYamlPropertiesᚄ(ctx, field.Selections, res) } -func (ec *executionContext) fieldContext_ErrorSamplerAction_notes(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { +func (ec *executionContext) fieldContext_DestinationTypesCategoryItem_fields(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { fc = &graphql.FieldContext{ - Object: "ErrorSamplerAction", + Object: "DestinationTypesCategoryItem", Field: field, IsMethod: false, IsResolver: false, Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - return nil, errors.New("field of type String does not have child fields") + switch field.Name { + case "name": + return ec.fieldContext_DestinationFieldYamlProperties_name(ctx, field) + case "displayName": + return ec.fieldContext_DestinationFieldYamlProperties_displayName(ctx, field) + case "componentType": + return ec.fieldContext_DestinationFieldYamlProperties_componentType(ctx, field) + case "componentProperties": + return ec.fieldContext_DestinationFieldYamlProperties_componentProperties(ctx, field) + case "secret": + return ec.fieldContext_DestinationFieldYamlProperties_secret(ctx, field) + case "initialValue": + return ec.fieldContext_DestinationFieldYamlProperties_initialValue(ctx, field) + case "renderCondition": + return ec.fieldContext_DestinationFieldYamlProperties_renderCondition(ctx, field) + case "hideFromReadData": + return ec.fieldContext_DestinationFieldYamlProperties_hideFromReadData(ctx, field) + case "customReadDataLabels": + return ec.fieldContext_DestinationFieldYamlProperties_customReadDataLabels(ctx, field) + } + return nil, fmt.Errorf("no field named %q was found under type DestinationFieldYamlProperties", field.Name) }, } return fc, nil } -func (ec *executionContext) _ErrorSamplerAction_disable(ctx context.Context, field graphql.CollectedField, obj *model.ErrorSamplerAction) (ret graphql.Marshaler) { - fc, err := ec.fieldContext_ErrorSamplerAction_disable(ctx, field) +func (ec *executionContext) _DestinationsCategory_name(ctx context.Context, field graphql.CollectedField, obj *model.DestinationsCategory) (ret graphql.Marshaler) { + fc, err := ec.fieldContext_DestinationsCategory_name(ctx, field) if err != nil { return graphql.Null } @@ -7278,7 +7278,7 @@ func (ec *executionContext) _ErrorSamplerAction_disable(ctx context.Context, fie }() resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) { ctx = rctx // use context from middleware stack in children - return obj.Disable, nil + return obj.Name, nil }) if err != nil { ec.Error(ctx, err) @@ -7290,26 +7290,26 @@ func (ec *executionContext) _ErrorSamplerAction_disable(ctx context.Context, fie } return graphql.Null } - res := resTmp.(bool) + res := resTmp.(string) fc.Result = res - return ec.marshalNBoolean2bool(ctx, field.Selections, res) + return ec.marshalNString2string(ctx, field.Selections, res) } -func (ec *executionContext) fieldContext_ErrorSamplerAction_disable(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { +func (ec *executionContext) fieldContext_DestinationsCategory_name(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { fc = &graphql.FieldContext{ - Object: "ErrorSamplerAction", + Object: "DestinationsCategory", Field: field, IsMethod: false, IsResolver: false, Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - return nil, errors.New("field of type Boolean does not have child fields") + return nil, errors.New("field of type String does not have child fields") }, } return fc, nil } -func (ec *executionContext) _ErrorSamplerAction_signals(ctx context.Context, field graphql.CollectedField, obj *model.ErrorSamplerAction) (ret graphql.Marshaler) { - fc, err := ec.fieldContext_ErrorSamplerAction_signals(ctx, field) +func (ec *executionContext) _DestinationsCategory_description(ctx context.Context, field graphql.CollectedField, obj *model.DestinationsCategory) (ret graphql.Marshaler) { + fc, err := ec.fieldContext_DestinationsCategory_description(ctx, field) if err != nil { return graphql.Null } @@ -7322,7 +7322,7 @@ func (ec *executionContext) _ErrorSamplerAction_signals(ctx context.Context, fie }() resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) { ctx = rctx // use context from middleware stack in children - return obj.Signals, nil + return obj.Description, nil }) if err != nil { ec.Error(ctx, err) @@ -7334,26 +7334,26 @@ func (ec *executionContext) _ErrorSamplerAction_signals(ctx context.Context, fie } return graphql.Null } - res := resTmp.([]model.SignalType) + res := resTmp.(string) fc.Result = res - return ec.marshalNSignalType2ᚕgithubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐSignalTypeᚄ(ctx, field.Selections, res) + return ec.marshalNString2string(ctx, field.Selections, res) } -func (ec *executionContext) fieldContext_ErrorSamplerAction_signals(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { +func (ec *executionContext) fieldContext_DestinationsCategory_description(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { fc = &graphql.FieldContext{ - Object: "ErrorSamplerAction", + Object: "DestinationsCategory", Field: field, IsMethod: false, IsResolver: false, Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - return nil, errors.New("field of type SignalType does not have child fields") + return nil, errors.New("field of type String does not have child fields") }, } return fc, nil } -func (ec *executionContext) _ErrorSamplerAction_details(ctx context.Context, field graphql.CollectedField, obj *model.ErrorSamplerAction) (ret graphql.Marshaler) { - fc, err := ec.fieldContext_ErrorSamplerAction_details(ctx, field) +func (ec *executionContext) _DestinationsCategory_items(ctx context.Context, field graphql.CollectedField, obj *model.DestinationsCategory) (ret graphql.Marshaler) { + fc, err := ec.fieldContext_DestinationsCategory_items(ctx, field) if err != nil { return graphql.Null } @@ -7366,7 +7366,7 @@ func (ec *executionContext) _ErrorSamplerAction_details(ctx context.Context, fie }() resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) { ctx = rctx // use context from middleware stack in children - return obj.Details, nil + return obj.Items, nil }) if err != nil { ec.Error(ctx, err) @@ -7378,26 +7378,40 @@ func (ec *executionContext) _ErrorSamplerAction_details(ctx context.Context, fie } return graphql.Null } - res := resTmp.(string) + res := resTmp.([]*model.DestinationTypesCategoryItem) fc.Result = res - return ec.marshalNString2string(ctx, field.Selections, res) + return ec.marshalNDestinationTypesCategoryItem2ᚕᚖgithubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐDestinationTypesCategoryItemᚄ(ctx, field.Selections, res) } -func (ec *executionContext) fieldContext_ErrorSamplerAction_details(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { +func (ec *executionContext) fieldContext_DestinationsCategory_items(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { fc = &graphql.FieldContext{ - Object: "ErrorSamplerAction", + Object: "DestinationsCategory", Field: field, IsMethod: false, IsResolver: false, Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - return nil, errors.New("field of type String does not have child fields") + switch field.Name { + case "type": + return ec.fieldContext_DestinationTypesCategoryItem_type(ctx, field) + case "displayName": + return ec.fieldContext_DestinationTypesCategoryItem_displayName(ctx, field) + case "imageUrl": + return ec.fieldContext_DestinationTypesCategoryItem_imageUrl(ctx, field) + case "supportedSignals": + return ec.fieldContext_DestinationTypesCategoryItem_supportedSignals(ctx, field) + case "testConnectionSupported": + return ec.fieldContext_DestinationTypesCategoryItem_testConnectionSupported(ctx, field) + case "fields": + return ec.fieldContext_DestinationTypesCategoryItem_fields(ctx, field) + } + return nil, fmt.Errorf("no field named %q was found under type DestinationTypesCategoryItem", field.Name) }, } return fc, nil } -func (ec *executionContext) _ExportedSignals_traces(ctx context.Context, field graphql.CollectedField, obj *model.ExportedSignals) (ret graphql.Marshaler) { - fc, err := ec.fieldContext_ExportedSignals_traces(ctx, field) +func (ec *executionContext) _EntityProperty_name(ctx context.Context, field graphql.CollectedField, obj *model.EntityProperty) (ret graphql.Marshaler) { + fc, err := ec.fieldContext_EntityProperty_name(ctx, field) if err != nil { return graphql.Null } @@ -7410,7 +7424,7 @@ func (ec *executionContext) _ExportedSignals_traces(ctx context.Context, field g }() resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) { ctx = rctx // use context from middleware stack in children - return obj.Traces, nil + return obj.Name, nil }) if err != nil { ec.Error(ctx, err) @@ -7422,26 +7436,26 @@ func (ec *executionContext) _ExportedSignals_traces(ctx context.Context, field g } return graphql.Null } - res := resTmp.(bool) + res := resTmp.(string) fc.Result = res - return ec.marshalNBoolean2bool(ctx, field.Selections, res) + return ec.marshalNString2string(ctx, field.Selections, res) } -func (ec *executionContext) fieldContext_ExportedSignals_traces(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { +func (ec *executionContext) fieldContext_EntityProperty_name(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { fc = &graphql.FieldContext{ - Object: "ExportedSignals", + Object: "EntityProperty", Field: field, IsMethod: false, IsResolver: false, Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - return nil, errors.New("field of type Boolean does not have child fields") + return nil, errors.New("field of type String does not have child fields") }, } return fc, nil } -func (ec *executionContext) _ExportedSignals_metrics(ctx context.Context, field graphql.CollectedField, obj *model.ExportedSignals) (ret graphql.Marshaler) { - fc, err := ec.fieldContext_ExportedSignals_metrics(ctx, field) +func (ec *executionContext) _EntityProperty_value(ctx context.Context, field graphql.CollectedField, obj *model.EntityProperty) (ret graphql.Marshaler) { + fc, err := ec.fieldContext_EntityProperty_value(ctx, field) if err != nil { return graphql.Null } @@ -7454,7 +7468,7 @@ func (ec *executionContext) _ExportedSignals_metrics(ctx context.Context, field }() resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) { ctx = rctx // use context from middleware stack in children - return obj.Metrics, nil + return obj.Value, nil }) if err != nil { ec.Error(ctx, err) @@ -7466,26 +7480,26 @@ func (ec *executionContext) _ExportedSignals_metrics(ctx context.Context, field } return graphql.Null } - res := resTmp.(bool) + res := resTmp.(string) fc.Result = res - return ec.marshalNBoolean2bool(ctx, field.Selections, res) + return ec.marshalNString2string(ctx, field.Selections, res) } -func (ec *executionContext) fieldContext_ExportedSignals_metrics(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { +func (ec *executionContext) fieldContext_EntityProperty_value(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { fc = &graphql.FieldContext{ - Object: "ExportedSignals", + Object: "EntityProperty", Field: field, IsMethod: false, IsResolver: false, Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - return nil, errors.New("field of type Boolean does not have child fields") + return nil, errors.New("field of type String does not have child fields") }, } return fc, nil } -func (ec *executionContext) _ExportedSignals_logs(ctx context.Context, field graphql.CollectedField, obj *model.ExportedSignals) (ret graphql.Marshaler) { - fc, err := ec.fieldContext_ExportedSignals_logs(ctx, field) +func (ec *executionContext) _EntityProperty_status(ctx context.Context, field graphql.CollectedField, obj *model.EntityProperty) (ret graphql.Marshaler) { + fc, err := ec.fieldContext_EntityProperty_status(ctx, field) if err != nil { return graphql.Null } @@ -7498,38 +7512,35 @@ func (ec *executionContext) _ExportedSignals_logs(ctx context.Context, field gra }() resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) { ctx = rctx // use context from middleware stack in children - return obj.Logs, nil + return obj.Status, nil }) if err != nil { ec.Error(ctx, err) return graphql.Null } if resTmp == nil { - if !graphql.HasFieldError(ctx, fc) { - ec.Errorf(ctx, "must not be null") - } return graphql.Null } - res := resTmp.(bool) + res := resTmp.(*string) fc.Result = res - return ec.marshalNBoolean2bool(ctx, field.Selections, res) + return ec.marshalOString2ᚖstring(ctx, field.Selections, res) } -func (ec *executionContext) fieldContext_ExportedSignals_logs(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { +func (ec *executionContext) fieldContext_EntityProperty_status(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { fc = &graphql.FieldContext{ - Object: "ExportedSignals", + Object: "EntityProperty", Field: field, IsMethod: false, IsResolver: false, Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - return nil, errors.New("field of type Boolean does not have child fields") + return nil, errors.New("field of type String does not have child fields") }, } return fc, nil } -func (ec *executionContext) _Field_name(ctx context.Context, field graphql.CollectedField, obj *model.Field) (ret graphql.Marshaler) { - fc, err := ec.fieldContext_Field_name(ctx, field) +func (ec *executionContext) _EntityProperty_explain(ctx context.Context, field graphql.CollectedField, obj *model.EntityProperty) (ret graphql.Marshaler) { + fc, err := ec.fieldContext_EntityProperty_explain(ctx, field) if err != nil { return graphql.Null } @@ -7542,26 +7553,23 @@ func (ec *executionContext) _Field_name(ctx context.Context, field graphql.Colle }() resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) { ctx = rctx // use context from middleware stack in children - return obj.Name, nil + return obj.Explain, nil }) if err != nil { ec.Error(ctx, err) return graphql.Null } if resTmp == nil { - if !graphql.HasFieldError(ctx, fc) { - ec.Errorf(ctx, "must not be null") - } return graphql.Null } - res := resTmp.(string) + res := resTmp.(*string) fc.Result = res - return ec.marshalNString2string(ctx, field.Selections, res) + return ec.marshalOString2ᚖstring(ctx, field.Selections, res) } -func (ec *executionContext) fieldContext_Field_name(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { +func (ec *executionContext) fieldContext_EntityProperty_explain(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { fc = &graphql.FieldContext{ - Object: "Field", + Object: "EntityProperty", Field: field, IsMethod: false, IsResolver: false, @@ -7572,8 +7580,8 @@ func (ec *executionContext) fieldContext_Field_name(_ context.Context, field gra return fc, nil } -func (ec *executionContext) _Field_displayName(ctx context.Context, field graphql.CollectedField, obj *model.Field) (ret graphql.Marshaler) { - fc, err := ec.fieldContext_Field_displayName(ctx, field) +func (ec *executionContext) _ErrorSamplerAction_id(ctx context.Context, field graphql.CollectedField, obj *model.ErrorSamplerAction) (ret graphql.Marshaler) { + fc, err := ec.fieldContext_ErrorSamplerAction_id(ctx, field) if err != nil { return graphql.Null } @@ -7586,7 +7594,7 @@ func (ec *executionContext) _Field_displayName(ctx context.Context, field graphq }() resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) { ctx = rctx // use context from middleware stack in children - return obj.DisplayName, nil + return obj.ID, nil }) if err != nil { ec.Error(ctx, err) @@ -7600,24 +7608,24 @@ func (ec *executionContext) _Field_displayName(ctx context.Context, field graphq } res := resTmp.(string) fc.Result = res - return ec.marshalNString2string(ctx, field.Selections, res) + return ec.marshalNID2string(ctx, field.Selections, res) } -func (ec *executionContext) fieldContext_Field_displayName(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { +func (ec *executionContext) fieldContext_ErrorSamplerAction_id(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { fc = &graphql.FieldContext{ - Object: "Field", + Object: "ErrorSamplerAction", Field: field, IsMethod: false, IsResolver: false, Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - return nil, errors.New("field of type String does not have child fields") + return nil, errors.New("field of type ID does not have child fields") }, } return fc, nil } -func (ec *executionContext) _Field_componentType(ctx context.Context, field graphql.CollectedField, obj *model.Field) (ret graphql.Marshaler) { - fc, err := ec.fieldContext_Field_componentType(ctx, field) +func (ec *executionContext) _ErrorSamplerAction_type(ctx context.Context, field graphql.CollectedField, obj *model.ErrorSamplerAction) (ret graphql.Marshaler) { + fc, err := ec.fieldContext_ErrorSamplerAction_type(ctx, field) if err != nil { return graphql.Null } @@ -7630,7 +7638,7 @@ func (ec *executionContext) _Field_componentType(ctx context.Context, field grap }() resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) { ctx = rctx // use context from middleware stack in children - return obj.ComponentType, nil + return obj.Type, nil }) if err != nil { ec.Error(ctx, err) @@ -7647,9 +7655,9 @@ func (ec *executionContext) _Field_componentType(ctx context.Context, field grap return ec.marshalNString2string(ctx, field.Selections, res) } -func (ec *executionContext) fieldContext_Field_componentType(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { +func (ec *executionContext) fieldContext_ErrorSamplerAction_type(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { fc = &graphql.FieldContext{ - Object: "Field", + Object: "ErrorSamplerAction", Field: field, IsMethod: false, IsResolver: false, @@ -7660,8 +7668,8 @@ func (ec *executionContext) fieldContext_Field_componentType(_ context.Context, return fc, nil } -func (ec *executionContext) _Field_componentProperties(ctx context.Context, field graphql.CollectedField, obj *model.Field) (ret graphql.Marshaler) { - fc, err := ec.fieldContext_Field_componentProperties(ctx, field) +func (ec *executionContext) _ErrorSamplerAction_name(ctx context.Context, field graphql.CollectedField, obj *model.ErrorSamplerAction) (ret graphql.Marshaler) { + fc, err := ec.fieldContext_ErrorSamplerAction_name(ctx, field) if err != nil { return graphql.Null } @@ -7674,26 +7682,64 @@ func (ec *executionContext) _Field_componentProperties(ctx context.Context, fiel }() resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) { ctx = rctx // use context from middleware stack in children - return obj.ComponentProperties, nil + return obj.Name, nil }) if err != nil { ec.Error(ctx, err) return graphql.Null } if resTmp == nil { - if !graphql.HasFieldError(ctx, fc) { - ec.Errorf(ctx, "must not be null") + return graphql.Null + } + res := resTmp.(*string) + fc.Result = res + return ec.marshalOString2ᚖstring(ctx, field.Selections, res) +} + +func (ec *executionContext) fieldContext_ErrorSamplerAction_name(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "ErrorSamplerAction", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return nil, errors.New("field of type String does not have child fields") + }, + } + return fc, nil +} + +func (ec *executionContext) _ErrorSamplerAction_notes(ctx context.Context, field graphql.CollectedField, obj *model.ErrorSamplerAction) (ret graphql.Marshaler) { + fc, err := ec.fieldContext_ErrorSamplerAction_notes(ctx, field) + if err != nil { + return graphql.Null + } + ctx = graphql.WithFieldContext(ctx, fc) + defer func() { + if r := recover(); r != nil { + ec.Error(ctx, ec.Recover(ctx, r)) + ret = graphql.Null } + }() + resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) { + ctx = rctx // use context from middleware stack in children + return obj.Notes, nil + }) + if err != nil { + ec.Error(ctx, err) return graphql.Null } - res := resTmp.(string) + if resTmp == nil { + return graphql.Null + } + res := resTmp.(*string) fc.Result = res - return ec.marshalNString2string(ctx, field.Selections, res) + return ec.marshalOString2ᚖstring(ctx, field.Selections, res) } -func (ec *executionContext) fieldContext_Field_componentProperties(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { +func (ec *executionContext) fieldContext_ErrorSamplerAction_notes(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { fc = &graphql.FieldContext{ - Object: "Field", + Object: "ErrorSamplerAction", Field: field, IsMethod: false, IsResolver: false, @@ -7704,8 +7750,8 @@ func (ec *executionContext) fieldContext_Field_componentProperties(_ context.Con return fc, nil } -func (ec *executionContext) _Field_secret(ctx context.Context, field graphql.CollectedField, obj *model.Field) (ret graphql.Marshaler) { - fc, err := ec.fieldContext_Field_secret(ctx, field) +func (ec *executionContext) _ErrorSamplerAction_disable(ctx context.Context, field graphql.CollectedField, obj *model.ErrorSamplerAction) (ret graphql.Marshaler) { + fc, err := ec.fieldContext_ErrorSamplerAction_disable(ctx, field) if err != nil { return graphql.Null } @@ -7718,7 +7764,7 @@ func (ec *executionContext) _Field_secret(ctx context.Context, field graphql.Col }() resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) { ctx = rctx // use context from middleware stack in children - return obj.Secret, nil + return obj.Disable, nil }) if err != nil { ec.Error(ctx, err) @@ -7735,9 +7781,9 @@ func (ec *executionContext) _Field_secret(ctx context.Context, field graphql.Col return ec.marshalNBoolean2bool(ctx, field.Selections, res) } -func (ec *executionContext) fieldContext_Field_secret(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { +func (ec *executionContext) fieldContext_ErrorSamplerAction_disable(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { fc = &graphql.FieldContext{ - Object: "Field", + Object: "ErrorSamplerAction", Field: field, IsMethod: false, IsResolver: false, @@ -7748,8 +7794,8 @@ func (ec *executionContext) fieldContext_Field_secret(_ context.Context, field g return fc, nil } -func (ec *executionContext) _Field_initialValue(ctx context.Context, field graphql.CollectedField, obj *model.Field) (ret graphql.Marshaler) { - fc, err := ec.fieldContext_Field_initialValue(ctx, field) +func (ec *executionContext) _ErrorSamplerAction_signals(ctx context.Context, field graphql.CollectedField, obj *model.ErrorSamplerAction) (ret graphql.Marshaler) { + fc, err := ec.fieldContext_ErrorSamplerAction_signals(ctx, field) if err != nil { return graphql.Null } @@ -7762,7 +7808,7 @@ func (ec *executionContext) _Field_initialValue(ctx context.Context, field graph }() resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) { ctx = rctx // use context from middleware stack in children - return obj.InitialValue, nil + return obj.Signals, nil }) if err != nil { ec.Error(ctx, err) @@ -7774,26 +7820,26 @@ func (ec *executionContext) _Field_initialValue(ctx context.Context, field graph } return graphql.Null } - res := resTmp.(string) + res := resTmp.([]model.SignalType) fc.Result = res - return ec.marshalNString2string(ctx, field.Selections, res) + return ec.marshalNSignalType2ᚕgithubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐSignalTypeᚄ(ctx, field.Selections, res) } -func (ec *executionContext) fieldContext_Field_initialValue(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { +func (ec *executionContext) fieldContext_ErrorSamplerAction_signals(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { fc = &graphql.FieldContext{ - Object: "Field", + Object: "ErrorSamplerAction", Field: field, IsMethod: false, IsResolver: false, Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - return nil, errors.New("field of type String does not have child fields") + return nil, errors.New("field of type SignalType does not have child fields") }, } return fc, nil } -func (ec *executionContext) _Field_renderCondition(ctx context.Context, field graphql.CollectedField, obj *model.Field) (ret graphql.Marshaler) { - fc, err := ec.fieldContext_Field_renderCondition(ctx, field) +func (ec *executionContext) _ErrorSamplerAction_details(ctx context.Context, field graphql.CollectedField, obj *model.ErrorSamplerAction) (ret graphql.Marshaler) { + fc, err := ec.fieldContext_ErrorSamplerAction_details(ctx, field) if err != nil { return graphql.Null } @@ -7806,7 +7852,7 @@ func (ec *executionContext) _Field_renderCondition(ctx context.Context, field gr }() resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) { ctx = rctx // use context from middleware stack in children - return obj.RenderCondition, nil + return obj.Details, nil }) if err != nil { ec.Error(ctx, err) @@ -7818,14 +7864,14 @@ func (ec *executionContext) _Field_renderCondition(ctx context.Context, field gr } return graphql.Null } - res := resTmp.([]string) + res := resTmp.(string) fc.Result = res - return ec.marshalNString2ᚕstringᚄ(ctx, field.Selections, res) + return ec.marshalNString2string(ctx, field.Selections, res) } -func (ec *executionContext) fieldContext_Field_renderCondition(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { +func (ec *executionContext) fieldContext_ErrorSamplerAction_details(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { fc = &graphql.FieldContext{ - Object: "Field", + Object: "ErrorSamplerAction", Field: field, IsMethod: false, IsResolver: false, @@ -7836,8 +7882,8 @@ func (ec *executionContext) fieldContext_Field_renderCondition(_ context.Context return fc, nil } -func (ec *executionContext) _Field_hideFromReadData(ctx context.Context, field graphql.CollectedField, obj *model.Field) (ret graphql.Marshaler) { - fc, err := ec.fieldContext_Field_hideFromReadData(ctx, field) +func (ec *executionContext) _ExportedSignals_traces(ctx context.Context, field graphql.CollectedField, obj *model.ExportedSignals) (ret graphql.Marshaler) { + fc, err := ec.fieldContext_ExportedSignals_traces(ctx, field) if err != nil { return graphql.Null } @@ -7850,7 +7896,7 @@ func (ec *executionContext) _Field_hideFromReadData(ctx context.Context, field g }() resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) { ctx = rctx // use context from middleware stack in children - return obj.HideFromReadData, nil + return obj.Traces, nil }) if err != nil { ec.Error(ctx, err) @@ -7862,26 +7908,26 @@ func (ec *executionContext) _Field_hideFromReadData(ctx context.Context, field g } return graphql.Null } - res := resTmp.([]string) + res := resTmp.(bool) fc.Result = res - return ec.marshalNString2ᚕstringᚄ(ctx, field.Selections, res) + return ec.marshalNBoolean2bool(ctx, field.Selections, res) } -func (ec *executionContext) fieldContext_Field_hideFromReadData(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { +func (ec *executionContext) fieldContext_ExportedSignals_traces(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { fc = &graphql.FieldContext{ - Object: "Field", + Object: "ExportedSignals", Field: field, IsMethod: false, IsResolver: false, Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - return nil, errors.New("field of type String does not have child fields") + return nil, errors.New("field of type Boolean does not have child fields") }, } return fc, nil } -func (ec *executionContext) _Field_customReadDataLabels(ctx context.Context, field graphql.CollectedField, obj *model.Field) (ret graphql.Marshaler) { - fc, err := ec.fieldContext_Field_customReadDataLabels(ctx, field) +func (ec *executionContext) _ExportedSignals_metrics(ctx context.Context, field graphql.CollectedField, obj *model.ExportedSignals) (ret graphql.Marshaler) { + fc, err := ec.fieldContext_ExportedSignals_metrics(ctx, field) if err != nil { return graphql.Null } @@ -7894,7 +7940,7 @@ func (ec *executionContext) _Field_customReadDataLabels(ctx context.Context, fie }() resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) { ctx = rctx // use context from middleware stack in children - return obj.CustomReadDataLabels, nil + return obj.Metrics, nil }) if err != nil { ec.Error(ctx, err) @@ -7906,34 +7952,26 @@ func (ec *executionContext) _Field_customReadDataLabels(ctx context.Context, fie } return graphql.Null } - res := resTmp.([]*model.CustomReadDataLabel) + res := resTmp.(bool) fc.Result = res - return ec.marshalNCustomReadDataLabel2ᚕᚖgithubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐCustomReadDataLabelᚄ(ctx, field.Selections, res) + return ec.marshalNBoolean2bool(ctx, field.Selections, res) } -func (ec *executionContext) fieldContext_Field_customReadDataLabels(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { +func (ec *executionContext) fieldContext_ExportedSignals_metrics(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { fc = &graphql.FieldContext{ - Object: "Field", + Object: "ExportedSignals", Field: field, IsMethod: false, IsResolver: false, Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - switch field.Name { - case "condition": - return ec.fieldContext_CustomReadDataLabel_condition(ctx, field) - case "title": - return ec.fieldContext_CustomReadDataLabel_title(ctx, field) - case "value": - return ec.fieldContext_CustomReadDataLabel_value(ctx, field) - } - return nil, fmt.Errorf("no field named %q was found under type CustomReadDataLabel", field.Name) + return nil, errors.New("field of type Boolean does not have child fields") }, } return fc, nil } -func (ec *executionContext) _GetConfigResponse_installation(ctx context.Context, field graphql.CollectedField, obj *model.GetConfigResponse) (ret graphql.Marshaler) { - fc, err := ec.fieldContext_GetConfigResponse_installation(ctx, field) +func (ec *executionContext) _ExportedSignals_logs(ctx context.Context, field graphql.CollectedField, obj *model.ExportedSignals) (ret graphql.Marshaler) { + fc, err := ec.fieldContext_ExportedSignals_logs(ctx, field) if err != nil { return graphql.Null } @@ -7946,7 +7984,7 @@ func (ec *executionContext) _GetConfigResponse_installation(ctx context.Context, }() resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) { ctx = rctx // use context from middleware stack in children - return obj.Installation, nil + return obj.Logs, nil }) if err != nil { ec.Error(ctx, err) @@ -7958,26 +7996,26 @@ func (ec *executionContext) _GetConfigResponse_installation(ctx context.Context, } return graphql.Null } - res := resTmp.(model.InstallationStatus) + res := resTmp.(bool) fc.Result = res - return ec.marshalNInstallationStatus2githubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐInstallationStatus(ctx, field.Selections, res) + return ec.marshalNBoolean2bool(ctx, field.Selections, res) } -func (ec *executionContext) fieldContext_GetConfigResponse_installation(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { +func (ec *executionContext) fieldContext_ExportedSignals_logs(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { fc = &graphql.FieldContext{ - Object: "GetConfigResponse", + Object: "ExportedSignals", Field: field, IsMethod: false, IsResolver: false, Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - return nil, errors.New("field of type InstallationStatus does not have child fields") + return nil, errors.New("field of type Boolean does not have child fields") }, } return fc, nil } -func (ec *executionContext) _GetConfigResponse_readonly(ctx context.Context, field graphql.CollectedField, obj *model.GetConfigResponse) (ret graphql.Marshaler) { - fc, err := ec.fieldContext_GetConfigResponse_readonly(ctx, field) +func (ec *executionContext) _GetConfigResponse_installation(ctx context.Context, field graphql.CollectedField, obj *model.GetConfigResponse) (ret graphql.Marshaler) { + fc, err := ec.fieldContext_GetConfigResponse_installation(ctx, field) if err != nil { return graphql.Null } @@ -7990,7 +8028,7 @@ func (ec *executionContext) _GetConfigResponse_readonly(ctx context.Context, fie }() resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) { ctx = rctx // use context from middleware stack in children - return obj.Readonly, nil + return obj.Installation, nil }) if err != nil { ec.Error(ctx, err) @@ -8002,26 +8040,26 @@ func (ec *executionContext) _GetConfigResponse_readonly(ctx context.Context, fie } return graphql.Null } - res := resTmp.(bool) + res := resTmp.(model.InstallationStatus) fc.Result = res - return ec.marshalNBoolean2bool(ctx, field.Selections, res) + return ec.marshalNInstallationStatus2githubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐInstallationStatus(ctx, field.Selections, res) } -func (ec *executionContext) fieldContext_GetConfigResponse_readonly(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { +func (ec *executionContext) fieldContext_GetConfigResponse_installation(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { fc = &graphql.FieldContext{ Object: "GetConfigResponse", Field: field, IsMethod: false, IsResolver: false, Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - return nil, errors.New("field of type Boolean does not have child fields") + return nil, errors.New("field of type InstallationStatus does not have child fields") }, } return fc, nil } -func (ec *executionContext) _GetDestinationDetailsResponse_fields(ctx context.Context, field graphql.CollectedField, obj *model.GetDestinationDetailsResponse) (ret graphql.Marshaler) { - fc, err := ec.fieldContext_GetDestinationDetailsResponse_fields(ctx, field) +func (ec *executionContext) _GetConfigResponse_readonly(ctx context.Context, field graphql.CollectedField, obj *model.GetConfigResponse) (ret graphql.Marshaler) { + fc, err := ec.fieldContext_GetConfigResponse_readonly(ctx, field) if err != nil { return graphql.Null } @@ -8034,7 +8072,7 @@ func (ec *executionContext) _GetDestinationDetailsResponse_fields(ctx context.Co }() resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) { ctx = rctx // use context from middleware stack in children - return obj.Fields, nil + return obj.Readonly, nil }) if err != nil { ec.Error(ctx, err) @@ -8046,46 +8084,26 @@ func (ec *executionContext) _GetDestinationDetailsResponse_fields(ctx context.Co } return graphql.Null } - res := resTmp.([]*model.Field) + res := resTmp.(bool) fc.Result = res - return ec.marshalNField2ᚕᚖgithubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐFieldᚄ(ctx, field.Selections, res) + return ec.marshalNBoolean2bool(ctx, field.Selections, res) } -func (ec *executionContext) fieldContext_GetDestinationDetailsResponse_fields(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { +func (ec *executionContext) fieldContext_GetConfigResponse_readonly(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { fc = &graphql.FieldContext{ - Object: "GetDestinationDetailsResponse", + Object: "GetConfigResponse", Field: field, IsMethod: false, IsResolver: false, Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - switch field.Name { - case "name": - return ec.fieldContext_Field_name(ctx, field) - case "displayName": - return ec.fieldContext_Field_displayName(ctx, field) - case "componentType": - return ec.fieldContext_Field_componentType(ctx, field) - case "componentProperties": - return ec.fieldContext_Field_componentProperties(ctx, field) - case "secret": - return ec.fieldContext_Field_secret(ctx, field) - case "initialValue": - return ec.fieldContext_Field_initialValue(ctx, field) - case "renderCondition": - return ec.fieldContext_Field_renderCondition(ctx, field) - case "hideFromReadData": - return ec.fieldContext_Field_hideFromReadData(ctx, field) - case "customReadDataLabels": - return ec.fieldContext_Field_customReadDataLabels(ctx, field) - } - return nil, fmt.Errorf("no field named %q was found under type Field", field.Name) + return nil, errors.New("field of type Boolean does not have child fields") }, } return fc, nil } -func (ec *executionContext) _GetDestinationTypesResponse_categories(ctx context.Context, field graphql.CollectedField, obj *model.GetDestinationTypesResponse) (ret graphql.Marshaler) { - fc, err := ec.fieldContext_GetDestinationTypesResponse_categories(ctx, field) +func (ec *executionContext) _GetDestinationCategories_categories(ctx context.Context, field graphql.CollectedField, obj *model.GetDestinationCategories) (ret graphql.Marshaler) { + fc, err := ec.fieldContext_GetDestinationCategories_categories(ctx, field) if err != nil { return graphql.Null } @@ -8110,14 +8128,14 @@ func (ec *executionContext) _GetDestinationTypesResponse_categories(ctx context. } return graphql.Null } - res := resTmp.([]model.DestinationsCategory) + res := resTmp.([]*model.DestinationsCategory) fc.Result = res - return ec.marshalNDestinationsCategory2ᚕgithubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐDestinationsCategoryᚄ(ctx, field.Selections, res) + return ec.marshalNDestinationsCategory2ᚕᚖgithubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐDestinationsCategoryᚄ(ctx, field.Selections, res) } -func (ec *executionContext) fieldContext_GetDestinationTypesResponse_categories(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { +func (ec *executionContext) fieldContext_GetDestinationCategories_categories(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { fc = &graphql.FieldContext{ - Object: "GetDestinationTypesResponse", + Object: "GetDestinationCategories", Field: field, IsMethod: false, IsResolver: false, @@ -8125,6 +8143,8 @@ func (ec *executionContext) fieldContext_GetDestinationTypesResponse_categories( switch field.Name { case "name": return ec.fieldContext_DestinationsCategory_name(ctx, field) + case "description": + return ec.fieldContext_DestinationsCategory_description(ctx, field) case "items": return ec.fieldContext_DestinationsCategory_items(ctx, field) } @@ -14015,8 +14035,8 @@ func (ec *executionContext) fieldContext_Query_config(_ context.Context, field g return fc, nil } -func (ec *executionContext) _Query_destinationTypes(ctx context.Context, field graphql.CollectedField) (ret graphql.Marshaler) { - fc, err := ec.fieldContext_Query_destinationTypes(ctx, field) +func (ec *executionContext) _Query_destinationCategories(ctx context.Context, field graphql.CollectedField) (ret graphql.Marshaler) { + fc, err := ec.fieldContext_Query_destinationCategories(ctx, field) if err != nil { return graphql.Null } @@ -14029,7 +14049,7 @@ func (ec *executionContext) _Query_destinationTypes(ctx context.Context, field g }() resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) { ctx = rctx // use context from middleware stack in children - return ec.resolvers.Query().DestinationTypes(rctx) + return ec.resolvers.Query().DestinationCategories(rctx) }) if err != nil { ec.Error(ctx, err) @@ -14038,12 +14058,12 @@ func (ec *executionContext) _Query_destinationTypes(ctx context.Context, field g if resTmp == nil { return graphql.Null } - res := resTmp.(*model.GetDestinationTypesResponse) + res := resTmp.(*model.GetDestinationCategories) fc.Result = res - return ec.marshalOGetDestinationTypesResponse2ᚖgithubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐGetDestinationTypesResponse(ctx, field.Selections, res) + return ec.marshalOGetDestinationCategories2ᚖgithubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐGetDestinationCategories(ctx, field.Selections, res) } -func (ec *executionContext) fieldContext_Query_destinationTypes(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { +func (ec *executionContext) fieldContext_Query_destinationCategories(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { fc = &graphql.FieldContext{ Object: "Query", Field: field, @@ -14052,67 +14072,11 @@ func (ec *executionContext) fieldContext_Query_destinationTypes(_ context.Contex Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { switch field.Name { case "categories": - return ec.fieldContext_GetDestinationTypesResponse_categories(ctx, field) - } - return nil, fmt.Errorf("no field named %q was found under type GetDestinationTypesResponse", field.Name) - }, - } - return fc, nil -} - -func (ec *executionContext) _Query_destinationTypeDetails(ctx context.Context, field graphql.CollectedField) (ret graphql.Marshaler) { - fc, err := ec.fieldContext_Query_destinationTypeDetails(ctx, field) - if err != nil { - return graphql.Null - } - ctx = graphql.WithFieldContext(ctx, fc) - defer func() { - if r := recover(); r != nil { - ec.Error(ctx, ec.Recover(ctx, r)) - ret = graphql.Null - } - }() - resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) { - ctx = rctx // use context from middleware stack in children - return ec.resolvers.Query().DestinationTypeDetails(rctx, fc.Args["type"].(string)) - }) - if err != nil { - ec.Error(ctx, err) - return graphql.Null - } - if resTmp == nil { - return graphql.Null - } - res := resTmp.(*model.GetDestinationDetailsResponse) - fc.Result = res - return ec.marshalOGetDestinationDetailsResponse2ᚖgithubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐGetDestinationDetailsResponse(ctx, field.Selections, res) -} - -func (ec *executionContext) fieldContext_Query_destinationTypeDetails(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { - fc = &graphql.FieldContext{ - Object: "Query", - Field: field, - IsMethod: true, - IsResolver: true, - Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - switch field.Name { - case "fields": - return ec.fieldContext_GetDestinationDetailsResponse_fields(ctx, field) + return ec.fieldContext_GetDestinationCategories_categories(ctx, field) } - return nil, fmt.Errorf("no field named %q was found under type GetDestinationDetailsResponse", field.Name) + return nil, fmt.Errorf("no field named %q was found under type GetDestinationCategories", field.Name) }, } - defer func() { - if r := recover(); r != nil { - err = ec.Recover(ctx, r) - ec.Error(ctx, err) - } - }() - ctx = graphql.WithFieldContext(ctx, fc) - if fc.Args, err = ec.field_Query_destinationTypeDetails_args(ctx, field.ArgumentMap(ec.Variables)); err != nil { - ec.Error(ctx, err) - return fc, err - } return fc, nil } @@ -15997,9 +15961,9 @@ func (ec *executionContext) _SupportedSignals_traces(ctx context.Context, field } return graphql.Null } - res := resTmp.(model.ObservabilitySignalSupport) + res := resTmp.(*model.ObservabilitySignalSupport) fc.Result = res - return ec.marshalNObservabilitySignalSupport2githubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐObservabilitySignalSupport(ctx, field.Selections, res) + return ec.marshalNObservabilitySignalSupport2ᚖgithubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐObservabilitySignalSupport(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_SupportedSignals_traces(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -16045,9 +16009,9 @@ func (ec *executionContext) _SupportedSignals_metrics(ctx context.Context, field } return graphql.Null } - res := resTmp.(model.ObservabilitySignalSupport) + res := resTmp.(*model.ObservabilitySignalSupport) fc.Result = res - return ec.marshalNObservabilitySignalSupport2githubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐObservabilitySignalSupport(ctx, field.Selections, res) + return ec.marshalNObservabilitySignalSupport2ᚖgithubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐObservabilitySignalSupport(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_SupportedSignals_metrics(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -16093,9 +16057,9 @@ func (ec *executionContext) _SupportedSignals_logs(ctx context.Context, field gr } return graphql.Null } - res := resTmp.(model.ObservabilitySignalSupport) + res := resTmp.(*model.ObservabilitySignalSupport) fc.Result = res - return ec.marshalNObservabilitySignalSupport2githubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐObservabilitySignalSupport(ctx, field.Selections, res) + return ec.marshalNObservabilitySignalSupport2ᚖgithubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐObservabilitySignalSupport(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_SupportedSignals_logs(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -19863,97 +19827,84 @@ func (ec *executionContext) _Destination(ctx context.Context, sel ast.SelectionS case "id": out.Values[i] = ec._Destination_id(ctx, field, obj) if out.Values[i] == graphql.Null { - atomic.AddUint32(&out.Invalids, 1) + out.Invalids++ } case "name": out.Values[i] = ec._Destination_name(ctx, field, obj) if out.Values[i] == graphql.Null { - atomic.AddUint32(&out.Invalids, 1) + out.Invalids++ } case "type": - field := field - - innerFunc := func(ctx context.Context, fs *graphql.FieldSet) (res graphql.Marshaler) { - defer func() { - if r := recover(); r != nil { - ec.Error(ctx, ec.Recover(ctx, r)) - } - }() - res = ec._Destination_type(ctx, field, obj) - if res == graphql.Null { - atomic.AddUint32(&fs.Invalids, 1) - } - return res - } - - if field.Deferrable != nil { - dfs, ok := deferred[field.Deferrable.Label] - di := 0 - if ok { - dfs.AddField(field) - di = len(dfs.Values) - 1 - } else { - dfs = graphql.NewFieldSet([]graphql.CollectedField{field}) - deferred[field.Deferrable.Label] = dfs - } - dfs.Concurrently(di, func(ctx context.Context) graphql.Marshaler { - return innerFunc(ctx, dfs) - }) - - // don't run the out.Concurrently() call below - out.Values[i] = graphql.Null - continue + out.Values[i] = ec._Destination_type(ctx, field, obj) + if out.Values[i] == graphql.Null { + out.Invalids++ } - - out.Concurrently(i, func(ctx context.Context) graphql.Marshaler { return innerFunc(ctx, out) }) case "exportedSignals": out.Values[i] = ec._Destination_exportedSignals(ctx, field, obj) if out.Values[i] == graphql.Null { - atomic.AddUint32(&out.Invalids, 1) + out.Invalids++ } case "fields": out.Values[i] = ec._Destination_fields(ctx, field, obj) if out.Values[i] == graphql.Null { - atomic.AddUint32(&out.Invalids, 1) + out.Invalids++ } case "destinationType": out.Values[i] = ec._Destination_destinationType(ctx, field, obj) if out.Values[i] == graphql.Null { - atomic.AddUint32(&out.Invalids, 1) + out.Invalids++ } case "conditions": - field := field + out.Values[i] = ec._Destination_conditions(ctx, field, obj) + default: + panic("unknown field " + strconv.Quote(field.Name)) + } + } + out.Dispatch(ctx) + if out.Invalids > 0 { + return graphql.Null + } - innerFunc := func(ctx context.Context, _ *graphql.FieldSet) (res graphql.Marshaler) { - defer func() { - if r := recover(); r != nil { - ec.Error(ctx, ec.Recover(ctx, r)) - } - }() - res = ec._Destination_conditions(ctx, field, obj) - return res - } + atomic.AddInt32(&ec.deferred, int32(len(deferred))) - if field.Deferrable != nil { - dfs, ok := deferred[field.Deferrable.Label] - di := 0 - if ok { - dfs.AddField(field) - di = len(dfs.Values) - 1 - } else { - dfs = graphql.NewFieldSet([]graphql.CollectedField{field}) - deferred[field.Deferrable.Label] = dfs - } - dfs.Concurrently(di, func(ctx context.Context) graphql.Marshaler { - return innerFunc(ctx, dfs) - }) + for label, dfs := range deferred { + ec.processDeferredGroup(graphql.DeferredGroup{ + Label: label, + Path: graphql.GetPath(ctx), + FieldSet: dfs, + Context: ctx, + }) + } - // don't run the out.Concurrently() call below - out.Values[i] = graphql.Null - continue - } + return out +} + +var destinationDetailsImplementors = []string{"DestinationDetails"} + +func (ec *executionContext) _DestinationDetails(ctx context.Context, sel ast.SelectionSet, obj *model.DestinationDetails) graphql.Marshaler { + fields := graphql.CollectFields(ec.OperationContext, sel, destinationDetailsImplementors) - out.Concurrently(i, func(ctx context.Context) graphql.Marshaler { return innerFunc(ctx, out) }) + out := graphql.NewFieldSet(fields) + deferred := make(map[string]*graphql.FieldSet) + for i, field := range fields { + switch field.Name { + case "__typename": + out.Values[i] = graphql.MarshalString("DestinationDetails") + case "type": + out.Values[i] = ec._DestinationDetails_type(ctx, field, obj) + if out.Values[i] == graphql.Null { + out.Invalids++ + } + case "urlString": + out.Values[i] = ec._DestinationDetails_urlString(ctx, field, obj) + if out.Values[i] == graphql.Null { + out.Invalids++ + } + case "fields": + out.Values[i] = ec._DestinationDetails_fields(ctx, field, obj) + if out.Values[i] == graphql.Null { + out.Invalids++ + } default: panic("unknown field " + strconv.Quote(field.Name)) } @@ -19977,29 +19928,59 @@ func (ec *executionContext) _Destination(ctx context.Context, sel ast.SelectionS return out } -var destinationDetailsImplementors = []string{"DestinationDetails"} +var destinationFieldYamlPropertiesImplementors = []string{"DestinationFieldYamlProperties"} -func (ec *executionContext) _DestinationDetails(ctx context.Context, sel ast.SelectionSet, obj *model.DestinationDetails) graphql.Marshaler { - fields := graphql.CollectFields(ec.OperationContext, sel, destinationDetailsImplementors) +func (ec *executionContext) _DestinationFieldYamlProperties(ctx context.Context, sel ast.SelectionSet, obj *model.DestinationFieldYamlProperties) graphql.Marshaler { + fields := graphql.CollectFields(ec.OperationContext, sel, destinationFieldYamlPropertiesImplementors) out := graphql.NewFieldSet(fields) deferred := make(map[string]*graphql.FieldSet) for i, field := range fields { switch field.Name { case "__typename": - out.Values[i] = graphql.MarshalString("DestinationDetails") - case "type": - out.Values[i] = ec._DestinationDetails_type(ctx, field, obj) + out.Values[i] = graphql.MarshalString("DestinationFieldYamlProperties") + case "name": + out.Values[i] = ec._DestinationFieldYamlProperties_name(ctx, field, obj) if out.Values[i] == graphql.Null { out.Invalids++ } - case "urlString": - out.Values[i] = ec._DestinationDetails_urlString(ctx, field, obj) + case "displayName": + out.Values[i] = ec._DestinationFieldYamlProperties_displayName(ctx, field, obj) if out.Values[i] == graphql.Null { out.Invalids++ } - case "fields": - out.Values[i] = ec._DestinationDetails_fields(ctx, field, obj) + case "componentType": + out.Values[i] = ec._DestinationFieldYamlProperties_componentType(ctx, field, obj) + if out.Values[i] == graphql.Null { + out.Invalids++ + } + case "componentProperties": + out.Values[i] = ec._DestinationFieldYamlProperties_componentProperties(ctx, field, obj) + if out.Values[i] == graphql.Null { + out.Invalids++ + } + case "secret": + out.Values[i] = ec._DestinationFieldYamlProperties_secret(ctx, field, obj) + if out.Values[i] == graphql.Null { + out.Invalids++ + } + case "initialValue": + out.Values[i] = ec._DestinationFieldYamlProperties_initialValue(ctx, field, obj) + if out.Values[i] == graphql.Null { + out.Invalids++ + } + case "renderCondition": + out.Values[i] = ec._DestinationFieldYamlProperties_renderCondition(ctx, field, obj) + if out.Values[i] == graphql.Null { + out.Invalids++ + } + case "hideFromReadData": + out.Values[i] = ec._DestinationFieldYamlProperties_hideFromReadData(ctx, field, obj) + if out.Values[i] == graphql.Null { + out.Invalids++ + } + case "customReadDataLabels": + out.Values[i] = ec._DestinationFieldYamlProperties_customReadDataLabels(ctx, field, obj) if out.Values[i] == graphql.Null { out.Invalids++ } @@ -20062,6 +20043,11 @@ func (ec *executionContext) _DestinationTypesCategoryItem(ctx context.Context, s if out.Values[i] == graphql.Null { out.Invalids++ } + case "fields": + out.Values[i] = ec._DestinationTypesCategoryItem_fields(ctx, field, obj) + if out.Values[i] == graphql.Null { + out.Invalids++ + } default: panic("unknown field " + strconv.Quote(field.Name)) } @@ -20101,6 +20087,11 @@ func (ec *executionContext) _DestinationsCategory(ctx context.Context, sel ast.S if out.Values[i] == graphql.Null { out.Invalids++ } + case "description": + out.Values[i] = ec._DestinationsCategory_description(ctx, field, obj) + if out.Values[i] == graphql.Null { + out.Invalids++ + } case "items": out.Values[i] = ec._DestinationsCategory_items(ctx, field, obj) if out.Values[i] == graphql.Null { @@ -20289,85 +20280,6 @@ func (ec *executionContext) _ExportedSignals(ctx context.Context, sel ast.Select return out } -var fieldImplementors = []string{"Field"} - -func (ec *executionContext) _Field(ctx context.Context, sel ast.SelectionSet, obj *model.Field) graphql.Marshaler { - fields := graphql.CollectFields(ec.OperationContext, sel, fieldImplementors) - - out := graphql.NewFieldSet(fields) - deferred := make(map[string]*graphql.FieldSet) - for i, field := range fields { - switch field.Name { - case "__typename": - out.Values[i] = graphql.MarshalString("Field") - case "name": - out.Values[i] = ec._Field_name(ctx, field, obj) - if out.Values[i] == graphql.Null { - out.Invalids++ - } - case "displayName": - out.Values[i] = ec._Field_displayName(ctx, field, obj) - if out.Values[i] == graphql.Null { - out.Invalids++ - } - case "componentType": - out.Values[i] = ec._Field_componentType(ctx, field, obj) - if out.Values[i] == graphql.Null { - out.Invalids++ - } - case "componentProperties": - out.Values[i] = ec._Field_componentProperties(ctx, field, obj) - if out.Values[i] == graphql.Null { - out.Invalids++ - } - case "secret": - out.Values[i] = ec._Field_secret(ctx, field, obj) - if out.Values[i] == graphql.Null { - out.Invalids++ - } - case "initialValue": - out.Values[i] = ec._Field_initialValue(ctx, field, obj) - if out.Values[i] == graphql.Null { - out.Invalids++ - } - case "renderCondition": - out.Values[i] = ec._Field_renderCondition(ctx, field, obj) - if out.Values[i] == graphql.Null { - out.Invalids++ - } - case "hideFromReadData": - out.Values[i] = ec._Field_hideFromReadData(ctx, field, obj) - if out.Values[i] == graphql.Null { - out.Invalids++ - } - case "customReadDataLabels": - out.Values[i] = ec._Field_customReadDataLabels(ctx, field, obj) - if out.Values[i] == graphql.Null { - out.Invalids++ - } - default: - panic("unknown field " + strconv.Quote(field.Name)) - } - } - out.Dispatch(ctx) - if out.Invalids > 0 { - return graphql.Null - } - - atomic.AddInt32(&ec.deferred, int32(len(deferred))) - - for label, dfs := range deferred { - ec.processDeferredGroup(graphql.DeferredGroup{ - Label: label, - Path: graphql.GetPath(ctx), - FieldSet: dfs, - Context: ctx, - }) - } - - return out -} - var getConfigResponseImplementors = []string{"GetConfigResponse"} func (ec *executionContext) _GetConfigResponse(ctx context.Context, sel ast.SelectionSet, obj *model.GetConfigResponse) graphql.Marshaler { @@ -20412,58 +20324,19 @@ func (ec *executionContext) _GetConfigResponse(ctx context.Context, sel ast.Sele return out } -var getDestinationDetailsResponseImplementors = []string{"GetDestinationDetailsResponse"} - -func (ec *executionContext) _GetDestinationDetailsResponse(ctx context.Context, sel ast.SelectionSet, obj *model.GetDestinationDetailsResponse) graphql.Marshaler { - fields := graphql.CollectFields(ec.OperationContext, sel, getDestinationDetailsResponseImplementors) - - out := graphql.NewFieldSet(fields) - deferred := make(map[string]*graphql.FieldSet) - for i, field := range fields { - switch field.Name { - case "__typename": - out.Values[i] = graphql.MarshalString("GetDestinationDetailsResponse") - case "fields": - out.Values[i] = ec._GetDestinationDetailsResponse_fields(ctx, field, obj) - if out.Values[i] == graphql.Null { - out.Invalids++ - } - default: - panic("unknown field " + strconv.Quote(field.Name)) - } - } - out.Dispatch(ctx) - if out.Invalids > 0 { - return graphql.Null - } - - atomic.AddInt32(&ec.deferred, int32(len(deferred))) - - for label, dfs := range deferred { - ec.processDeferredGroup(graphql.DeferredGroup{ - Label: label, - Path: graphql.GetPath(ctx), - FieldSet: dfs, - Context: ctx, - }) - } - - return out -} - -var getDestinationTypesResponseImplementors = []string{"GetDestinationTypesResponse"} +var getDestinationCategoriesImplementors = []string{"GetDestinationCategories"} -func (ec *executionContext) _GetDestinationTypesResponse(ctx context.Context, sel ast.SelectionSet, obj *model.GetDestinationTypesResponse) graphql.Marshaler { - fields := graphql.CollectFields(ec.OperationContext, sel, getDestinationTypesResponseImplementors) +func (ec *executionContext) _GetDestinationCategories(ctx context.Context, sel ast.SelectionSet, obj *model.GetDestinationCategories) graphql.Marshaler { + fields := graphql.CollectFields(ec.OperationContext, sel, getDestinationCategoriesImplementors) out := graphql.NewFieldSet(fields) deferred := make(map[string]*graphql.FieldSet) for i, field := range fields { switch field.Name { case "__typename": - out.Values[i] = graphql.MarshalString("GetDestinationTypesResponse") + out.Values[i] = graphql.MarshalString("GetDestinationCategories") case "categories": - out.Values[i] = ec._GetDestinationTypesResponse_categories(ctx, field, obj) + out.Values[i] = ec._GetDestinationCategories_categories(ctx, field, obj) if out.Values[i] == graphql.Null { out.Invalids++ } @@ -21852,26 +21725,7 @@ func (ec *executionContext) _Query(ctx context.Context, sel ast.SelectionSet) gr } out.Concurrently(i, func(ctx context.Context) graphql.Marshaler { return rrm(innerCtx) }) - case "destinationTypes": - field := field - - innerFunc := func(ctx context.Context, _ *graphql.FieldSet) (res graphql.Marshaler) { - defer func() { - if r := recover(); r != nil { - ec.Error(ctx, ec.Recover(ctx, r)) - } - }() - res = ec._Query_destinationTypes(ctx, field) - return res - } - - rrm := func(ctx context.Context) graphql.Marshaler { - return ec.OperationContext.RootResolverMiddleware(ctx, - func(ctx context.Context) graphql.Marshaler { return innerFunc(ctx, out) }) - } - - out.Concurrently(i, func(ctx context.Context) graphql.Marshaler { return rrm(innerCtx) }) - case "destinationTypeDetails": + case "destinationCategories": field := field innerFunc := func(ctx context.Context, _ *graphql.FieldSet) (res graphql.Marshaler) { @@ -21880,7 +21734,7 @@ func (ec *executionContext) _Query(ctx context.Context, sel ast.SelectionSet) gr ec.Error(ctx, ec.Recover(ctx, r)) } }() - res = ec._Query_destinationTypeDetails(ctx, field) + res = ec._Query_destinationCategories(ctx, field) return res } @@ -23225,16 +23079,7 @@ func (ec *executionContext) marshalNDestinationDetails2ᚖgithubᚗcomᚋodigos return ec._DestinationDetails(ctx, sel, v) } -func (ec *executionContext) unmarshalNDestinationInput2githubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐDestinationInput(ctx context.Context, v interface{}) (model.DestinationInput, error) { - res, err := ec.unmarshalInputDestinationInput(ctx, v) - return res, graphql.ErrorOnPath(ctx, err) -} - -func (ec *executionContext) marshalNDestinationTypesCategoryItem2githubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐDestinationTypesCategoryItem(ctx context.Context, sel ast.SelectionSet, v model.DestinationTypesCategoryItem) graphql.Marshaler { - return ec._DestinationTypesCategoryItem(ctx, sel, &v) -} - -func (ec *executionContext) marshalNDestinationTypesCategoryItem2ᚕgithubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐDestinationTypesCategoryItemᚄ(ctx context.Context, sel ast.SelectionSet, v []model.DestinationTypesCategoryItem) graphql.Marshaler { +func (ec *executionContext) marshalNDestinationFieldYamlProperties2ᚕᚖgithubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐDestinationFieldYamlPropertiesᚄ(ctx context.Context, sel ast.SelectionSet, v []*model.DestinationFieldYamlProperties) graphql.Marshaler { ret := make(graphql.Array, len(v)) var wg sync.WaitGroup isLen1 := len(v) == 1 @@ -23258,7 +23103,7 @@ func (ec *executionContext) marshalNDestinationTypesCategoryItem2ᚕgithubᚗcom if !isLen1 { defer wg.Done() } - ret[i] = ec.marshalNDestinationTypesCategoryItem2githubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐDestinationTypesCategoryItem(ctx, sel, v[i]) + ret[i] = ec.marshalNDestinationFieldYamlProperties2ᚖgithubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐDestinationFieldYamlProperties(ctx, sel, v[i]) } if isLen1 { f(i) @@ -23278,11 +23123,22 @@ func (ec *executionContext) marshalNDestinationTypesCategoryItem2ᚕgithubᚗcom return ret } -func (ec *executionContext) marshalNDestinationsCategory2githubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐDestinationsCategory(ctx context.Context, sel ast.SelectionSet, v model.DestinationsCategory) graphql.Marshaler { - return ec._DestinationsCategory(ctx, sel, &v) +func (ec *executionContext) marshalNDestinationFieldYamlProperties2ᚖgithubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐDestinationFieldYamlProperties(ctx context.Context, sel ast.SelectionSet, v *model.DestinationFieldYamlProperties) graphql.Marshaler { + if v == nil { + if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) { + ec.Errorf(ctx, "the requested element is null which the schema does not allow") + } + return graphql.Null + } + return ec._DestinationFieldYamlProperties(ctx, sel, v) +} + +func (ec *executionContext) unmarshalNDestinationInput2githubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐDestinationInput(ctx context.Context, v interface{}) (model.DestinationInput, error) { + res, err := ec.unmarshalInputDestinationInput(ctx, v) + return res, graphql.ErrorOnPath(ctx, err) } -func (ec *executionContext) marshalNDestinationsCategory2ᚕgithubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐDestinationsCategoryᚄ(ctx context.Context, sel ast.SelectionSet, v []model.DestinationsCategory) graphql.Marshaler { +func (ec *executionContext) marshalNDestinationTypesCategoryItem2ᚕᚖgithubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐDestinationTypesCategoryItemᚄ(ctx context.Context, sel ast.SelectionSet, v []*model.DestinationTypesCategoryItem) graphql.Marshaler { ret := make(graphql.Array, len(v)) var wg sync.WaitGroup isLen1 := len(v) == 1 @@ -23306,7 +23162,7 @@ func (ec *executionContext) marshalNDestinationsCategory2ᚕgithubᚗcomᚋodigo if !isLen1 { defer wg.Done() } - ret[i] = ec.marshalNDestinationsCategory2githubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐDestinationsCategory(ctx, sel, v[i]) + ret[i] = ec.marshalNDestinationTypesCategoryItem2ᚖgithubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐDestinationTypesCategoryItem(ctx, sel, v[i]) } if isLen1 { f(i) @@ -23326,7 +23182,17 @@ func (ec *executionContext) marshalNDestinationsCategory2ᚕgithubᚗcomᚋodigo return ret } -func (ec *executionContext) marshalNEntityProperty2ᚕᚖgithubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐEntityPropertyᚄ(ctx context.Context, sel ast.SelectionSet, v []*model.EntityProperty) graphql.Marshaler { +func (ec *executionContext) marshalNDestinationTypesCategoryItem2ᚖgithubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐDestinationTypesCategoryItem(ctx context.Context, sel ast.SelectionSet, v *model.DestinationTypesCategoryItem) graphql.Marshaler { + if v == nil { + if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) { + ec.Errorf(ctx, "the requested element is null which the schema does not allow") + } + return graphql.Null + } + return ec._DestinationTypesCategoryItem(ctx, sel, v) +} + +func (ec *executionContext) marshalNDestinationsCategory2ᚕᚖgithubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐDestinationsCategoryᚄ(ctx context.Context, sel ast.SelectionSet, v []*model.DestinationsCategory) graphql.Marshaler { ret := make(graphql.Array, len(v)) var wg sync.WaitGroup isLen1 := len(v) == 1 @@ -23350,7 +23216,7 @@ func (ec *executionContext) marshalNEntityProperty2ᚕᚖgithubᚗcomᚋodigos if !isLen1 { defer wg.Done() } - ret[i] = ec.marshalNEntityProperty2ᚖgithubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐEntityProperty(ctx, sel, v[i]) + ret[i] = ec.marshalNDestinationsCategory2ᚖgithubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐDestinationsCategory(ctx, sel, v[i]) } if isLen1 { f(i) @@ -23370,26 +23236,17 @@ func (ec *executionContext) marshalNEntityProperty2ᚕᚖgithubᚗcomᚋodigos return ret } -func (ec *executionContext) marshalNEntityProperty2ᚖgithubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐEntityProperty(ctx context.Context, sel ast.SelectionSet, v *model.EntityProperty) graphql.Marshaler { +func (ec *executionContext) marshalNDestinationsCategory2ᚖgithubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐDestinationsCategory(ctx context.Context, sel ast.SelectionSet, v *model.DestinationsCategory) graphql.Marshaler { if v == nil { if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) { ec.Errorf(ctx, "the requested element is null which the schema does not allow") } return graphql.Null } - return ec._EntityProperty(ctx, sel, v) -} - -func (ec *executionContext) marshalNExportedSignals2githubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐExportedSignals(ctx context.Context, sel ast.SelectionSet, v model.ExportedSignals) graphql.Marshaler { - return ec._ExportedSignals(ctx, sel, &v) -} - -func (ec *executionContext) unmarshalNExportedSignalsInput2ᚖgithubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐExportedSignalsInput(ctx context.Context, v interface{}) (*model.ExportedSignalsInput, error) { - res, err := ec.unmarshalInputExportedSignalsInput(ctx, v) - return &res, graphql.ErrorOnPath(ctx, err) + return ec._DestinationsCategory(ctx, sel, v) } -func (ec *executionContext) marshalNField2ᚕᚖgithubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐFieldᚄ(ctx context.Context, sel ast.SelectionSet, v []*model.Field) graphql.Marshaler { +func (ec *executionContext) marshalNEntityProperty2ᚕᚖgithubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐEntityPropertyᚄ(ctx context.Context, sel ast.SelectionSet, v []*model.EntityProperty) graphql.Marshaler { ret := make(graphql.Array, len(v)) var wg sync.WaitGroup isLen1 := len(v) == 1 @@ -23413,7 +23270,7 @@ func (ec *executionContext) marshalNField2ᚕᚖgithubᚗcomᚋodigosᚑioᚋodi if !isLen1 { defer wg.Done() } - ret[i] = ec.marshalNField2ᚖgithubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐField(ctx, sel, v[i]) + ret[i] = ec.marshalNEntityProperty2ᚖgithubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐEntityProperty(ctx, sel, v[i]) } if isLen1 { f(i) @@ -23433,14 +23290,29 @@ func (ec *executionContext) marshalNField2ᚕᚖgithubᚗcomᚋodigosᚑioᚋodi return ret } -func (ec *executionContext) marshalNField2ᚖgithubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐField(ctx context.Context, sel ast.SelectionSet, v *model.Field) graphql.Marshaler { +func (ec *executionContext) marshalNEntityProperty2ᚖgithubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐEntityProperty(ctx context.Context, sel ast.SelectionSet, v *model.EntityProperty) graphql.Marshaler { + if v == nil { + if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) { + ec.Errorf(ctx, "the requested element is null which the schema does not allow") + } + return graphql.Null + } + return ec._EntityProperty(ctx, sel, v) +} + +func (ec *executionContext) marshalNExportedSignals2ᚖgithubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐExportedSignals(ctx context.Context, sel ast.SelectionSet, v *model.ExportedSignals) graphql.Marshaler { if v == nil { if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) { ec.Errorf(ctx, "the requested element is null which the schema does not allow") } return graphql.Null } - return ec._Field(ctx, sel, v) + return ec._ExportedSignals(ctx, sel, v) +} + +func (ec *executionContext) unmarshalNExportedSignalsInput2ᚖgithubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐExportedSignalsInput(ctx context.Context, v interface{}) (*model.ExportedSignalsInput, error) { + res, err := ec.unmarshalInputExportedSignalsInput(ctx, v) + return &res, graphql.ErrorOnPath(ctx, err) } func (ec *executionContext) unmarshalNFieldInput2ᚕᚖgithubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐFieldInputᚄ(ctx context.Context, v interface{}) ([]*model.FieldInput, error) { @@ -23748,8 +23620,14 @@ func (ec *executionContext) marshalNNodeCollectorAnalyze2ᚖgithubᚗcomᚋodigo return ec._NodeCollectorAnalyze(ctx, sel, v) } -func (ec *executionContext) marshalNObservabilitySignalSupport2githubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐObservabilitySignalSupport(ctx context.Context, sel ast.SelectionSet, v model.ObservabilitySignalSupport) graphql.Marshaler { - return ec._ObservabilitySignalSupport(ctx, sel, &v) +func (ec *executionContext) marshalNObservabilitySignalSupport2ᚖgithubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐObservabilitySignalSupport(ctx context.Context, sel ast.SelectionSet, v *model.ObservabilitySignalSupport) graphql.Marshaler { + if v == nil { + if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) { + ec.Errorf(ctx, "the requested element is null which the schema does not allow") + } + return graphql.Null + } + return ec._ObservabilitySignalSupport(ctx, sel, v) } func (ec *executionContext) marshalNOdigosAnalyze2githubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐOdigosAnalyze(ctx context.Context, sel ast.SelectionSet, v model.OdigosAnalyze) graphql.Marshaler { @@ -24299,8 +24177,14 @@ func (ec *executionContext) marshalNString2ᚕᚖstring(ctx context.Context, sel return ret } -func (ec *executionContext) marshalNSupportedSignals2githubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐSupportedSignals(ctx context.Context, sel ast.SelectionSet, v model.SupportedSignals) graphql.Marshaler { - return ec._SupportedSignals(ctx, sel, &v) +func (ec *executionContext) marshalNSupportedSignals2ᚖgithubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐSupportedSignals(ctx context.Context, sel ast.SelectionSet, v *model.SupportedSignals) graphql.Marshaler { + if v == nil { + if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) { + ec.Errorf(ctx, "the requested element is null which the schema does not allow") + } + return graphql.Null + } + return ec._SupportedSignals(ctx, sel, v) } func (ec *executionContext) marshalNTestConnectionResponse2githubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐTestConnectionResponse(ctx context.Context, sel ast.SelectionSet, v model.TestConnectionResponse) graphql.Marshaler { @@ -24701,18 +24585,11 @@ func (ec *executionContext) marshalOGetConfigResponse2ᚖgithubᚗcomᚋodigos return ec._GetConfigResponse(ctx, sel, v) } -func (ec *executionContext) marshalOGetDestinationDetailsResponse2ᚖgithubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐGetDestinationDetailsResponse(ctx context.Context, sel ast.SelectionSet, v *model.GetDestinationDetailsResponse) graphql.Marshaler { - if v == nil { - return graphql.Null - } - return ec._GetDestinationDetailsResponse(ctx, sel, v) -} - -func (ec *executionContext) marshalOGetDestinationTypesResponse2ᚖgithubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐGetDestinationTypesResponse(ctx context.Context, sel ast.SelectionSet, v *model.GetDestinationTypesResponse) graphql.Marshaler { +func (ec *executionContext) marshalOGetDestinationCategories2ᚖgithubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐGetDestinationCategories(ctx context.Context, sel ast.SelectionSet, v *model.GetDestinationCategories) graphql.Marshaler { if v == nil { return graphql.Null } - return ec._GetDestinationTypesResponse(ctx, sel, v) + return ec._GetDestinationCategories(ctx, sel, v) } func (ec *executionContext) marshalOHttpPayloadCollection2ᚖgithubᚗcomᚋodigosᚑioᚋodigosᚋfrontendᚋgraphᚋmodelᚐHTTPPayloadCollection(ctx context.Context, sel ast.SelectionSet, v *model.HTTPPayloadCollection) graphql.Marshaler { diff --git a/frontend/graph/model/destination.go b/frontend/graph/model/destination.go index 5f2890a08e..8b53790705 100644 --- a/frontend/graph/model/destination.go +++ b/frontend/graph/model/destination.go @@ -1,48 +1 @@ package model - -import ( - "github.com/odigos-io/odigos/common" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" -) - -type GetDestinationTypesResponse struct { - Categories []DestinationsCategory `json:"categories"` -} - -type DestinationTypesCategoryItem struct { - Type string `json:"type"` - DisplayName string `json:"display_name"` - ImageUrl string `json:"image_url"` - SupportedSignals SupportedSignals `json:"supported_signals"` - TestConnectionSupported bool `json:"test_connection_supported"` -} - -type SupportedSignals struct { - Traces ObservabilitySignalSupport `json:"traces"` - Metrics ObservabilitySignalSupport `json:"metrics"` - Logs ObservabilitySignalSupport `json:"logs"` -} - -type ObservabilitySignalSupport struct { - Supported bool `json:"supported"` -} -type DestinationsCategory struct { - Name string `json:"name"` - Items []DestinationTypesCategoryItem `json:"items"` -} - -type ExportedSignals struct { - Traces bool `json:"traces"` - Metrics bool `json:"metrics"` - Logs bool `json:"logs"` -} - -type Destination struct { - Id string `json:"id"` - Name string `json:"name"` - Type common.DestinationType `json:"type"` - ExportedSignals ExportedSignals `json:"signals"` - Fields string `json:"fields"` - DestinationType DestinationTypesCategoryItem `json:"destination_type"` - Conditions []metav1.Condition `json:"conditions,omitempty"` -} diff --git a/frontend/graph/model/models_gen.go b/frontend/graph/model/models_gen.go index b6d5bbdbce..4c35d489ae 100644 --- a/frontend/graph/model/models_gen.go +++ b/frontend/graph/model/models_gen.go @@ -178,12 +178,34 @@ func (this DeleteAttributeAction) GetSignals() []SignalType { return interfaceSlice } +type Destination struct { + ID string `json:"id"` + Name string `json:"name"` + Type string `json:"type"` + ExportedSignals *ExportedSignals `json:"exportedSignals"` + Fields string `json:"fields"` + DestinationType *DestinationTypesCategoryItem `json:"destinationType"` + Conditions []*Condition `json:"conditions,omitempty"` +} + type DestinationDetails struct { Type string `json:"type"` URLString string `json:"urlString"` Fields string `json:"fields"` } +type DestinationFieldYamlProperties struct { + Name string `json:"name"` + DisplayName string `json:"displayName"` + ComponentType string `json:"componentType"` + ComponentProperties string `json:"componentProperties"` + Secret bool `json:"secret"` + InitialValue string `json:"initialValue"` + RenderCondition []string `json:"renderCondition"` + HideFromReadData []string `json:"hideFromReadData"` + CustomReadDataLabels []*CustomReadDataLabel `json:"customReadDataLabels"` +} + type DestinationInput struct { Name string `json:"name"` Type string `json:"type"` @@ -191,6 +213,21 @@ type DestinationInput struct { Fields []*FieldInput `json:"fields"` } +type DestinationTypesCategoryItem struct { + Type string `json:"type"` + DisplayName string `json:"displayName"` + ImageURL string `json:"imageUrl"` + SupportedSignals *SupportedSignals `json:"supportedSignals"` + TestConnectionSupported bool `json:"testConnectionSupported"` + Fields []*DestinationFieldYamlProperties `json:"fields"` +} + +type DestinationsCategory struct { + Name string `json:"name"` + Description string `json:"description"` + Items []*DestinationTypesCategoryItem `json:"items"` +} + type EntityProperty struct { Name string `json:"name"` Value string `json:"value"` @@ -225,22 +262,16 @@ func (this ErrorSamplerAction) GetSignals() []SignalType { return interfaceSlice } -type ExportedSignalsInput struct { +type ExportedSignals struct { Traces bool `json:"traces"` Metrics bool `json:"metrics"` Logs bool `json:"logs"` } -type Field struct { - Name string `json:"name"` - DisplayName string `json:"displayName"` - ComponentType string `json:"componentType"` - ComponentProperties string `json:"componentProperties"` - Secret bool `json:"secret"` - InitialValue string `json:"initialValue"` - RenderCondition []string `json:"renderCondition"` - HideFromReadData []string `json:"hideFromReadData"` - CustomReadDataLabels []*CustomReadDataLabel `json:"customReadDataLabels"` +type ExportedSignalsInput struct { + Traces bool `json:"traces"` + Metrics bool `json:"metrics"` + Logs bool `json:"logs"` } type FieldInput struct { @@ -253,8 +284,8 @@ type GetConfigResponse struct { Readonly bool `json:"readonly"` } -type GetDestinationDetailsResponse struct { - Fields []*Field `json:"fields"` +type GetDestinationCategories struct { + Categories []*DestinationsCategory `json:"categories"` } type HTTPPayloadCollection struct { @@ -406,6 +437,10 @@ type NodeCollectorAnalyze struct { AvailableNodes *EntityProperty `json:"availableNodes,omitempty"` } +type ObservabilitySignalSupport struct { + Supported bool `json:"supported"` +} + type OdigosAnalyze struct { OdigosVersion *EntityProperty `json:"odigosVersion"` KubernetesVersion *EntityProperty `json:"kubernetesVersion"` @@ -620,6 +655,12 @@ type SourceContainer struct { OtelDistroName *string `json:"otelDistroName,omitempty"` } +type SupportedSignals struct { + Traces *ObservabilitySignalSupport `json:"traces"` + Metrics *ObservabilitySignalSupport `json:"metrics"` + Logs *ObservabilitySignalSupport `json:"logs"` +} + type TestConnectionResponse struct { Succeeded bool `json:"succeeded"` StatusCode int `json:"statusCode"` diff --git a/frontend/graph/schema.graphqls b/frontend/graph/schema.graphqls index 20f81a33cd..27bf4799b1 100644 --- a/frontend/graph/schema.graphqls +++ b/frontend/graph/schema.graphqls @@ -241,20 +241,40 @@ type ObservabilitySignalSupport { supported: Boolean! } +type CustomReadDataLabel { + condition: String! + title: String! + value: String! +} + +type DestinationFieldYamlProperties { + name: String! + displayName: String! + componentType: String! + componentProperties: String! # Using String to store JSON data as a string + secret: Boolean! + initialValue: String! + renderCondition: [String!]! + hideFromReadData: [String!]! + customReadDataLabels: [CustomReadDataLabel!]! +} + type DestinationTypesCategoryItem { type: String! displayName: String! imageUrl: String! supportedSignals: SupportedSignals! testConnectionSupported: Boolean! + fields: [DestinationFieldYamlProperties!]! } type DestinationsCategory { name: String! + description: String! items: [DestinationTypesCategoryItem!]! } -type GetDestinationTypesResponse { +type GetDestinationCategories { categories: [DestinationsCategory!]! } @@ -279,28 +299,6 @@ type GetConfigResponse { readonly: Boolean! } -type CustomReadDataLabel { - condition: String! - title: String! - value: String! -} - -type Field { - name: String! - displayName: String! - componentType: String! - componentProperties: String! # Using String to store JSON data as a string - secret: Boolean! - initialValue: String! - renderCondition: [String!]! - hideFromReadData: [String!]! - customReadDataLabels: [CustomReadDataLabel!]! -} - -type GetDestinationDetailsResponse { - fields: [Field!]! -} - input DestinationInput { name: String! type: String! @@ -587,8 +585,7 @@ type OdigosAnalyze { type Query { computePlatform: ComputePlatform config: GetConfigResponse - destinationTypes: GetDestinationTypesResponse - destinationTypeDetails(type: String!): GetDestinationDetailsResponse + destinationCategories: GetDestinationCategories potentialDestinations: [DestinationDetails!]! getOverviewMetrics: OverviewMetricsResponse! describeOdigos: OdigosAnalyze! diff --git a/frontend/graph/schema.resolvers.go b/frontend/graph/schema.resolvers.go index 2a34bdb1f0..32e4511c36 100644 --- a/frontend/graph/schema.resolvers.go +++ b/frontend/graph/schema.resolvers.go @@ -313,17 +313,6 @@ func (r *computePlatformResolver) InstrumentationRules(ctx context.Context, obj return services.ListInstrumentationRules(ctx) } -// Type is the resolver for the type field. -func (r *destinationResolver) Type(ctx context.Context, obj *model.Destination) (string, error) { - return string(obj.Type), nil -} - -// Conditions is the resolver for the conditions field. -func (r *destinationResolver) Conditions(ctx context.Context, obj *model.Destination) ([]*model.Condition, error) { - conditions := convertConditions(obj.Conditions) - return conditions, nil -} - // K8sActualSources is the resolver for the k8sActualSources field. func (r *k8sActualNamespaceResolver) K8sActualSources(ctx context.Context, obj *model.K8sActualNamespace) ([]*model.K8sActualSource, error) { ns := obj.Name @@ -847,43 +836,13 @@ func (r *queryResolver) Config(ctx context.Context) (*model.GetConfigResponse, e return &config, nil } -// DestinationTypes is the resolver for the destinationTypes field. -func (r *queryResolver) DestinationTypes(ctx context.Context) (*model.GetDestinationTypesResponse, error) { - destTypes := services.GetDestinationTypes() +// DestinationCategories is the resolver for the destinationCategories field. +func (r *queryResolver) DestinationCategories(ctx context.Context) (*model.GetDestinationCategories, error) { + destTypes := services.GetDestinationCategories() return &destTypes, nil } -// DestinationTypeDetails is the resolver for the destinationTypeDetails field. -func (r *queryResolver) DestinationTypeDetails(ctx context.Context, typeArg string) (*model.GetDestinationDetailsResponse, error) { - destType := common.DestinationType(typeArg) - destTypeConfig, err := services.GetDestinationTypeConfig(destType) - if err != nil { - return nil, fmt.Errorf("destination type %s not found", destType) - } - - var resp model.GetDestinationDetailsResponse - for _, field := range destTypeConfig.Spec.Fields { - componentPropsJSON, err := json.Marshal(field.ComponentProps) - if err != nil { - return nil, fmt.Errorf("error marshalling component properties: %v", err) - } - resp.Fields = append(resp.Fields, &model.Field{ - Name: field.Name, - DisplayName: field.DisplayName, - ComponentType: field.ComponentType, - ComponentProperties: string(componentPropsJSON), - Secret: field.Secret, - InitialValue: field.InitialValue, - RenderCondition: field.RenderCondition, - HideFromReadData: field.HideFromReadData, - CustomReadDataLabels: convertCustomReadDataLabels(field.CustomReadDataLabels), - }) - } - - return &resp, nil -} - // PotentialDestinations is the resolver for the potentialDestinations field. func (r *queryResolver) PotentialDestinations(ctx context.Context) ([]*model.DestinationDetails, error) { potentialDestinations := services.PotentialDestinations(ctx) @@ -957,9 +916,6 @@ func (r *queryResolver) DescribeSource(ctx context.Context, namespace string, ki // ComputePlatform returns ComputePlatformResolver implementation. func (r *Resolver) ComputePlatform() ComputePlatformResolver { return &computePlatformResolver{r} } -// Destination returns DestinationResolver implementation. -func (r *Resolver) Destination() DestinationResolver { return &destinationResolver{r} } - // K8sActualNamespace returns K8sActualNamespaceResolver implementation. func (r *Resolver) K8sActualNamespace() K8sActualNamespaceResolver { return &k8sActualNamespaceResolver{r} @@ -972,7 +928,6 @@ func (r *Resolver) Mutation() MutationResolver { return &mutationResolver{r} } func (r *Resolver) Query() QueryResolver { return &queryResolver{r} } type computePlatformResolver struct{ *Resolver } -type destinationResolver struct{ *Resolver } type k8sActualNamespaceResolver struct{ *Resolver } type mutationResolver struct{ *Resolver } type queryResolver struct{ *Resolver } diff --git a/frontend/services/destinations.go b/frontend/services/destinations.go index 26c4c8b54b..809d03c3b2 100644 --- a/frontend/services/destinations.go +++ b/frontend/services/destinations.go @@ -17,44 +17,78 @@ import ( "k8s.io/apimachinery/pkg/types" ) -func GetDestinationTypes() model.GetDestinationTypesResponse { - var resp model.GetDestinationTypesResponse - itemsByCategory := make(map[string][]model.DestinationTypesCategoryItem) +func GetDestinationCategories() model.GetDestinationCategories { + var resp model.GetDestinationCategories + itemsByCategory := make(map[string][]*model.DestinationTypesCategoryItem) + for _, destConfig := range destinations.Get() { item := DestinationTypeConfigToCategoryItem(destConfig) - itemsByCategory[destConfig.Metadata.Category] = append(itemsByCategory[destConfig.Metadata.Category], item) + itemsByCategory[destConfig.Metadata.Category] = append(itemsByCategory[destConfig.Metadata.Category], &item) + } + + descriptions := map[string]string{ + "managed": "Effortless Monitoring with Scalable Performance Management", + "self hosted": "Full Control and Customization for Advanced Application Monitoring", } for category, items := range itemsByCategory { - resp.Categories = append(resp.Categories, model.DestinationsCategory{ - Name: category, - Items: items, + resp.Categories = append(resp.Categories, &model.DestinationsCategory{ + Name: category, + Description: descriptions[category], + Items: items, }) - } return resp - } func DestinationTypeConfigToCategoryItem(destConfig destinations.Destination) model.DestinationTypesCategoryItem { + fields := []*model.DestinationFieldYamlProperties{} + + for _, field := range destConfig.Spec.Fields { + componentPropsJSON, err := json.Marshal(field.ComponentProps) + + var customReadDataLabels []*model.CustomReadDataLabel + for _, label := range field.CustomReadDataLabels { + customReadDataLabels = append(customReadDataLabels, &model.CustomReadDataLabel{ + Condition: label.Condition, + Title: label.Title, + Value: label.Value, + }) + } + + if err == nil { + fields = append(fields, &model.DestinationFieldYamlProperties{ + Name: field.Name, + DisplayName: field.DisplayName, + ComponentType: field.ComponentType, + ComponentProperties: string(componentPropsJSON), + Secret: field.Secret, + InitialValue: field.InitialValue, + RenderCondition: field.RenderCondition, + HideFromReadData: field.HideFromReadData, + CustomReadDataLabels: customReadDataLabels, + }) + } + } return model.DestinationTypesCategoryItem{ Type: string(destConfig.Metadata.Type), DisplayName: destConfig.Metadata.DisplayName, - ImageUrl: GetImageURL(destConfig.Spec.Image), + ImageURL: GetImageURL(destConfig.Spec.Image), TestConnectionSupported: destConfig.Spec.TestConnectionSupported, - SupportedSignals: model.SupportedSignals{ - Traces: model.ObservabilitySignalSupport{ + SupportedSignals: &model.SupportedSignals{ + Traces: &model.ObservabilitySignalSupport{ Supported: destConfig.Spec.Signals.Traces.Supported, }, - Metrics: model.ObservabilitySignalSupport{ + Metrics: &model.ObservabilitySignalSupport{ Supported: destConfig.Spec.Signals.Metrics.Supported, }, - Logs: model.ObservabilitySignalSupport{ + Logs: &model.ObservabilitySignalSupport{ Supported: destConfig.Spec.Signals.Logs.Supported, }, }, + Fields: fields, } } @@ -166,27 +200,27 @@ func K8sDestinationToEndpointFormat(k8sDest v1alpha1.Destination, secretFields m fieldsJSON = []byte("{}") // Set to an empty JSON object in case of error } - var conditions []metav1.Condition + var conditions []*model.Condition for _, condition := range k8sDest.Status.Conditions { - conditions = append(conditions, metav1.Condition{ + conditions = append(conditions, &model.Condition{ Type: condition.Type, - Status: condition.Status, - Message: condition.Message, - LastTransitionTime: condition.LastTransitionTime, + Status: model.ConditionStatus(condition.Status), + Message: &condition.Message, + LastTransitionTime: func(s string) *string { return &s }(condition.LastTransitionTime.String()), }) } return model.Destination{ - Id: k8sDest.Name, + ID: k8sDest.Name, Name: destName, - Type: destType, - ExportedSignals: model.ExportedSignals{ + Type: string(destType), + ExportedSignals: &model.ExportedSignals{ Traces: isSignalExported(k8sDest, common.TracesObservabilitySignal), Metrics: isSignalExported(k8sDest, common.MetricsObservabilitySignal), Logs: isSignalExported(k8sDest, common.LogsObservabilitySignal), }, Fields: string(fieldsJSON), - DestinationType: destTypeConfig, + DestinationType: &destTypeConfig, Conditions: conditions, } } diff --git a/frontend/webapp/@types/actions.ts b/frontend/webapp/@types/actions.ts new file mode 100644 index 0000000000..6b0bfd039e --- /dev/null +++ b/frontend/webapp/@types/actions.ts @@ -0,0 +1,41 @@ +import { ACTION_TYPE, type FetchedCondition } from '@odigos/ui-utils'; + +export interface FetchedAction { + id: string; + type: ACTION_TYPE; + conditions: FetchedCondition[]; + spec: string; +} + +// the stringified spec is parsed to this, which we still have to map to our ui-containers +export interface ParsedActionSpec { + actionName: string; + notes: string; + signals: string[]; + disabled?: boolean; + + clusterAttributes?: { attributeName: string; attributeStringValue: string }[] | null; + attributeNamesToDelete?: string[] | null; + renames?: { [oldKey: string]: string } | null; + + piiCategories?: string[] | null; + fallback_sampling_ratio?: number | null; + sampling_percentage?: string | null; + endpoints_filters?: + | { + service_name: string; + http_route: string; + minimum_latency_threshold: number; + fallback_sampling_ratio: number; + }[] + | null; +} + +export interface ActionInput { + type: ACTION_TYPE; + name: string; + notes: string; + disable: boolean; + signals: string[]; // uppercase + details: string; +} diff --git a/frontend/webapp/@types/compute-platform.ts b/frontend/webapp/@types/compute-platform.ts new file mode 100644 index 0000000000..1f570fd5b5 --- /dev/null +++ b/frontend/webapp/@types/compute-platform.ts @@ -0,0 +1,24 @@ +import type { FetchedSource } from './sources'; +import type { FetchedAction } from './actions'; +import type { FetchedNamespace } from './namespace'; +import type { TokenPayload } from '@odigos/ui-utils'; +import type { FetechedDestination } from './destinations'; +import type { FetchedInstrumentationRule } from './instrumentation-rules'; + +interface PaginatedData { + nextPage: string; + items: T[]; +} + +export interface ComputePlatform { + computePlatform: { + computePlatformType?: string; + apiTokens?: TokenPayload[]; + k8sActualNamespaces?: FetchedNamespace[]; + k8sActualNamespace?: FetchedNamespace; + sources?: PaginatedData; + destinations?: FetechedDestination[]; + actions?: FetchedAction[]; + instrumentationRules?: FetchedInstrumentationRule[]; + }; +} diff --git a/frontend/webapp/@types/config.ts b/frontend/webapp/@types/config.ts new file mode 100644 index 0000000000..3eda59eb98 --- /dev/null +++ b/frontend/webapp/@types/config.ts @@ -0,0 +1,12 @@ +export enum CONFIG_INSTALLATION { + NEW = 'NEW', + APPS_SELECTED = 'APPS_SELECTED', + FINISHED = 'FINISHED', +} + +export interface FetchedConfig { + config: { + installation: CONFIG_INSTALLATION; + readonly: boolean; + }; +} diff --git a/frontend/webapp/@types/destinations.ts b/frontend/webapp/@types/destinations.ts new file mode 100644 index 0000000000..ee45c3ad57 --- /dev/null +++ b/frontend/webapp/@types/destinations.ts @@ -0,0 +1,40 @@ +import type { DestinationCategories, FetchedCondition } from '@odigos/ui-utils'; +import type { DestinationDynamicField, DestinationFormData } from '@odigos/ui-containers'; + +export interface FetechedDestination { + id: string; + name: string; + exportedSignals: { + traces: boolean; + metrics: boolean; + logs: boolean; + }; + fields: string; + conditions: FetchedCondition[] | null; + destinationType: { + type: string; + displayName: string; + imageUrl: string; + supportedSignals: { + logs: { + supported: boolean; + }; + metrics: { + supported: boolean; + }; + traces: { + supported: boolean; + }; + }; + }; +} + +export interface FetchedDestinationCategories { + destinationCategories: { + categories: DestinationCategories; + }; +} + +export interface FetchedDestinationDynamicField extends DestinationDynamicField {} + +export interface DestinationInput extends DestinationFormData {} diff --git a/frontend/webapp/types/index.ts b/frontend/webapp/@types/index.ts similarity index 63% rename from frontend/webapp/types/index.ts rename to frontend/webapp/@types/index.ts index 4dee70aa12..1bb52ed19a 100644 --- a/frontend/webapp/types/index.ts +++ b/frontend/webapp/@types/index.ts @@ -1,10 +1,7 @@ export * from './actions'; -export * from './common'; export * from './compute-platform'; -export * from './data-flow'; -export * from './describe'; +export * from './config'; export * from './destinations'; export * from './instrumentation-rules'; -export * from './metrics'; export * from './namespace'; export * from './sources'; diff --git a/frontend/webapp/@types/instrumentation-rules.ts b/frontend/webapp/@types/instrumentation-rules.ts new file mode 100644 index 0000000000..c9e8c0e8a9 --- /dev/null +++ b/frontend/webapp/@types/instrumentation-rules.ts @@ -0,0 +1,14 @@ +import type { InstrumentationRule, WorkloadId } from '@odigos/ui-utils'; + +export interface FetchedInstrumentationRule { + ruleId: string; + ruleName: string; + notes: string; + disabled: boolean; + mutable: boolean; + profileName: string; + workloads?: WorkloadId[] | null; + instrumentationLibraries?: { language: string; library: string }[] | null; + payloadCollection: InstrumentationRule['payloadCollection']; // TODO: define this locally + codeAttributes: InstrumentationRule['codeAttributes']; // TODO: define this locally +} diff --git a/frontend/webapp/@types/namespace.ts b/frontend/webapp/@types/namespace.ts new file mode 100644 index 0000000000..e181c160f9 --- /dev/null +++ b/frontend/webapp/@types/namespace.ts @@ -0,0 +1,12 @@ +import { FetchedSource } from './sources'; + +export interface FetchedNamespace { + name: string; + selected: boolean; + k8sActualSources?: FetchedSource[]; +} + +export interface NamespaceInstrumentInput { + name: string; + futureSelected: boolean; +} diff --git a/frontend/webapp/@types/sources.ts b/frontend/webapp/@types/sources.ts new file mode 100644 index 0000000000..43d203d5c9 --- /dev/null +++ b/frontend/webapp/@types/sources.ts @@ -0,0 +1,9 @@ +import type { Source, FetchedCondition } from '@odigos/ui-utils'; + +export interface FetchedSource extends Source { + conditions: FetchedCondition[] | null; +} + +export interface SourceUpdateInput { + otelServiceName: string; +} diff --git a/frontend/webapp/README.md b/frontend/webapp/README.md index 66cb22e289..0a7350e9cf 100644 --- a/frontend/webapp/README.md +++ b/frontend/webapp/README.md @@ -1,38 +1,42 @@ -This is a [Next.js](https://nextjs.org/) project bootstrapped with [`create-next-app`](https://github.com/vercel/next.js/tree/canary/packages/create-next-app). +# Odigos UI -## Getting Started +## Development -First, run odigos backend: +To develop the UI, you'll need to maintain the UI libraries: -```bash -../odigos-backend --port 8085 --debug --address 0.0.0.0 -``` +- [ui-theme](https://github.com/odigos-io/ui-theme): colors, fonts etc. +- [ui-utils](https://github.com/odigos-io/ui-utils): functions, types, consts etc. +- [ui-icons](https://github.com/odigos-io/ui-icons): SVG icons transformed to JSX elements +- [ui-components](https://github.com/odigos-io/ui-components): re-usable components (mainly from Figma -> Design System) +- [ui-containers](https://github.com/odigos-io/ui-containers): "complex components", these contain logic and are not re-usable in the same UI, these are designed to re-use across multiple deployments of the same UI (e.g. cluster, cloud, etc.) -Next, run the development server: -```bash -npm run dev -# or -yarn dev -# or -pnpm dev -``` +## Runnin Locally -Open [http://localhost:3000](http://localhost:3000) with your browser to see the result. -You can start editing the pages by modifying `app` folder. The page auto-updates as you edit the file. +1. Install dependencies: + ```bash + yarn install + ``` -## Learn More +2. Create a client build: + ```bash + yarn build + ``` -To learn more about Next.js, take a look at the following resources: +3. Create a server build: + ```bash + yarn back:build + ``` -- [Next.js Documentation](https://nextjs.org/docs) - learn about Next.js features and API. -- [Learn Next.js](https://nextjs.org/learn) - an interactive Next.js tutorial. +4. Start the server: + ```bash + yarn back:start + ``` + You should now be able to visit the UI on [localhost:8085](http://localhost:8085). -You can check out [the Next.js GitHub repository](https://github.com/vercel/next.js/) - your feedback and contributions are welcome! - -## Deploy on Vercel - -The easiest way to deploy your Next.js app is to use the [Vercel Platform](https://vercel.com/new?utm_medium=default-template&filter=next.js&utm_source=create-next-app&utm_campaign=create-next-app-readme) from the creators of Next.js. - -Check out our [Next.js deployment documentation](https://nextjs.org/docs/deployment) for more details. +5. Note: if you want to get real-time code updates, you'll have to run the client seperately: + ```bash + yarn dev + ``` + You should now be able to visit the UI on [localhost:3000](http://localhost:3000). \ No newline at end of file diff --git a/frontend/webapp/app/(overview)/layout.tsx b/frontend/webapp/app/(overview)/layout.tsx deleted file mode 100644 index c2e7214df3..0000000000 --- a/frontend/webapp/app/(overview)/layout.tsx +++ /dev/null @@ -1,32 +0,0 @@ -'use client'; -import React from 'react'; -import styled from 'styled-components'; -import { MainHeader } from '@/components'; - -const LayoutContainer = styled.div` - width: 100%; - height: 100vh; - background-color: ${({ theme }) => theme.colors.primary}; - display: flex; - align-items: center; - flex-direction: column; -`; - -const MainContent = styled.div` - display: flex; - width: 100vw; - height: 76px; - flex-direction: column; - align-items: center; -`; - -export default function MainLayout({ children }: { children: React.ReactNode }) { - return ( - - - - {children} - - - ); -} diff --git a/frontend/webapp/app/(overview)/overview/page.tsx b/frontend/webapp/app/(overview)/overview/page.tsx deleted file mode 100644 index 8217514c4a..0000000000 --- a/frontend/webapp/app/(overview)/overview/page.tsx +++ /dev/null @@ -1,27 +0,0 @@ -'use client'; -import React from 'react'; -import dynamic from 'next/dynamic'; -import { usePaginatedSources, useSSE, useTokenTracker } from '@/hooks'; - -const ToastList = dynamic(() => import('@/components/notification/toast-list'), { ssr: false }); -const AllDrawers = dynamic(() => import('@/components/overview/all-drawers'), { ssr: false }); -const AllModals = dynamic(() => import('@/components/overview/all-modals'), { ssr: false }); -const OverviewDataFlowContainer = dynamic(() => import('@/containers/main/overview/overview-data-flow'), { ssr: false }); - -export default function MainPage() { - useSSE(); - useTokenTracker(); - - // "usePaginatedSources" is here to fetch sources just once - // (hooks run on every mount, we don't want that for pagination) - usePaginatedSources(); - - return ( - <> - - - - - - ); -} diff --git a/frontend/webapp/app/(setup)/choose-destination/page.tsx b/frontend/webapp/app/(setup)/choose-destination/page.tsx index eae2863c9a..e478c95cfb 100644 --- a/frontend/webapp/app/(setup)/choose-destination/page.tsx +++ b/frontend/webapp/app/(setup)/choose-destination/page.tsx @@ -1,16 +1,55 @@ 'use client'; -import React from 'react'; -import { SideMenu } from '@/components'; -import { SideMenuWrapper } from '../styled'; -import { AddDestinationContainer } from '@/containers/main'; +import React, { useState } from 'react'; +import { useRouter } from 'next/navigation'; +import { ROUTES } from '@/utils'; +import { Stepper } from '@odigos/ui-components'; +import { ENTITY_TYPES } from '@odigos/ui-utils'; +import { OnboardingStepperWrapper } from '@/components'; +import SetupHeader from '@/components/lib-imports/setup-header'; +import { DestinationSelectionForm, useSetupStore } from '@odigos/ui-containers'; +import { useDestinationCategories, useDestinationCRUD, usePotentialDestinations, useSSE, useTestConnection } from '@/hooks'; + +export default function Page() { + // call important hooks that should run on page-mount + useSSE(); + + const router = useRouter(); + const { configuredSources } = useSetupStore(); + + const { categories } = useDestinationCategories(); + const { createDestination } = useDestinationCRUD(); + const { potentialDestinations } = usePotentialDestinations(); + const { testConnection, loading: testLoading, data: testResult } = useTestConnection(); + + // we need this state, because "loading" from CRUD hooks is a bit delayed, and allows the user to double-click, as well as see elements render in the UI when they should not be rendered. + const [isLoading, setIsLoading] = useState(false); -export default function ChooseDestinationPage() { return ( <> - - - - + + + + + + + !!sources.length)} + goToSources={() => router.push(ROUTES.CHOOSE_SOURCES)} + /> ); } diff --git a/frontend/webapp/app/(setup)/choose-sources/page.tsx b/frontend/webapp/app/(setup)/choose-sources/page.tsx index a612ab2aec..da312e3737 100644 --- a/frontend/webapp/app/(setup)/choose-sources/page.tsx +++ b/frontend/webapp/app/(setup)/choose-sources/page.tsx @@ -1,16 +1,48 @@ 'use client'; -import React from 'react'; -import { SideMenu } from '@/components'; -import { ChooseSourcesContainer } from '@/containers/main'; -import { SideMenuWrapper } from '../styled'; -export default function ChooseSourcesPage() { +import React, { useRef, useState } from 'react'; +import { useNamespace, useSSE } from '@/hooks'; +import { ENTITY_TYPES } from '@odigos/ui-utils'; +import { Stepper } from '@odigos/ui-components'; +import { OnboardingStepperWrapper } from '@/components'; +import SetupHeader from '@/components/lib-imports/setup-header'; +import { FormRef, SourceSelectionForm } from '@odigos/ui-containers'; + +export default function Page() { + // call important hooks that should run on page-mount + useSSE(); + + const [selectedNamespace, setSelectedNamespace] = useState(''); + const onSelectNamespace = (ns: string) => setSelectedNamespace((prev) => (prev === ns ? '' : ns)); + const { allNamespaces, data: namespace, loading: nsLoad } = useNamespace(selectedNamespace); + + const formRef = useRef(null); + return ( <> - - - - + + + + + + + ); } diff --git a/frontend/webapp/app/(setup)/layout.tsx b/frontend/webapp/app/(setup)/layout.tsx deleted file mode 100644 index 6e7cab11e5..0000000000 --- a/frontend/webapp/app/(setup)/layout.tsx +++ /dev/null @@ -1,32 +0,0 @@ -'use client'; -import React from 'react'; -import styled from 'styled-components'; - -const LayoutContainer = styled.div` - width: 100%; - height: 100vh; - background-color: ${({ theme }) => theme.colors.primary}; - display: flex; - align-items: center; - flex-direction: column; -`; - -const MainContent = styled.div` - display: flex; - max-width: 1440px; - width: 100vh; - flex-direction: column; - align-items: center; -`; - -export default function SetupLayout({ - children, -}: { - children: React.ReactNode; -}) { - return ( - - {children} - - ); -} diff --git a/frontend/webapp/app/(setup)/styled.ts b/frontend/webapp/app/(setup)/styled.ts deleted file mode 100644 index a4d810aa6d..0000000000 --- a/frontend/webapp/app/(setup)/styled.ts +++ /dev/null @@ -1,11 +0,0 @@ -import styled from 'styled-components'; - -export const SideMenuWrapper = styled.div` - position: absolute; - left: 24px; - top: 144px; - - @media (max-width: 1050px) { - display: none; - } -`; diff --git a/frontend/webapp/app/layout.tsx b/frontend/webapp/app/layout.tsx index 346f0bd364..fa26cc1a66 100644 --- a/frontend/webapp/app/layout.tsx +++ b/frontend/webapp/app/layout.tsx @@ -1,39 +1,47 @@ 'use client'; -import React from 'react'; -import { METADATA } from '@/utils'; -import { ApolloWrapper } from '@/lib'; -import { ThemeProvider } from '@/styles'; -import { useDarkModeStore } from '@/store'; -import { AppErrorBoundary } from '@/components'; -export default function RootLayout({ children }: { children: React.ReactNode }) { - const { darkMode } = useDarkModeStore(); +import React, { type PropsWithChildren } from 'react'; +import dynamic from 'next/dynamic'; +import Theme from '@odigos/ui-theme'; +import { LayoutContainer } from '@/components'; +import { ToastList } from '@odigos/ui-containers'; +import ErrorBoundary from '@/components/providers/error-boundary'; +import ApolloProvider from '@/components/providers/apollo-provider'; + +const ThemeProvider = dynamic(() => import('@/components/providers/theme-provider'), { ssr: false }); + +function RootLayout({ children }: PropsWithChildren) { + const { darkMode } = Theme.useDarkMode(); return ( - - + + - {METADATA.title} + Odigos - - - - - {children} - - - - + + + + + + + {children} + + + + ); } + +export default RootLayout; diff --git a/frontend/webapp/app/overview/page.tsx b/frontend/webapp/app/overview/page.tsx new file mode 100644 index 0000000000..ea0ebd47f4 --- /dev/null +++ b/frontend/webapp/app/overview/page.tsx @@ -0,0 +1,63 @@ +'use client'; + +import React from 'react'; +import { MainContent } from '@/components'; +import { usePaginatedStore } from '@/store'; +import type { Source } from '@odigos/ui-utils'; +import OverviewHeader from '@/components/lib-imports/overview-header'; +import OverviewModalsAndDrawers from '@/components/lib-imports/overview-modals-and-drawers'; +import { DataFlow, DataFlowActionsMenu, MultiSourceControl, type SourceSelectionFormData } from '@odigos/ui-containers'; +import { useActionCRUD, useDestinationCRUD, useInstrumentationRuleCRUD, useMetrics, useNamespace, useSourceCRUD, useSSE, useTokenTracker } from '@/hooks'; + +export default function Page() { + // call important hooks that should run on page-mount + useSSE(); + useTokenTracker(); + + const { sourcesFetching } = usePaginatedStore(); + + const { metrics } = useMetrics(); + const { allNamespaces } = useNamespace(); + const { actions, filteredActions, loading: actLoad } = useActionCRUD(); + const { sources, filteredSources, loading: srcLoad, persistSources } = useSourceCRUD(); + const { destinations, filteredDestinations, loading: destLoad } = useDestinationCRUD(); + const { instrumentationRules, filteredInstrumentationRules, loading: ruleLoad } = useInstrumentationRuleCRUD(); + + return ( + <> + + + + + { + const inp: SourceSelectionFormData = {}; + + Object.entries(payload).forEach(([namespace, sources]: [string, Source[]]) => { + inp[namespace] = sources.map(({ name, kind }) => ({ name, kind, selected: false })); + }); + + persistSources(inp, {}); + }} + /> + + + + ); +} diff --git a/frontend/webapp/app/page.tsx b/frontend/webapp/app/page.tsx index ee708ead29..66c62d4967 100644 --- a/frontend/webapp/app/page.tsx +++ b/frontend/webapp/app/page.tsx @@ -1,8 +1,9 @@ 'use client'; import { useEffect } from 'react'; +import { ROUTES } from '@/utils'; import { useConfig } from '@/hooks'; -import { ROUTES, CONFIG } from '@/utils'; import { useRouter } from 'next/navigation'; +import { CONFIG_INSTALLATION } from '@/@types'; import { CenterThis, FadeLoader } from '@odigos/ui-components'; export default function App() { @@ -13,7 +14,7 @@ export default function App() { if (data) { const { installation, readonly } = data; - if (installation === CONFIG.NEW && !readonly) { + if (installation === CONFIG_INSTALLATION.NEW && !readonly) { router.push(ROUTES.CHOOSE_SOURCES); } else { router.push(ROUTES.OVERVIEW); diff --git a/frontend/webapp/components/app-error-boundary/index.tsx b/frontend/webapp/components/app-error-boundary/index.tsx deleted file mode 100644 index 9a2cecd4c6..0000000000 --- a/frontend/webapp/components/app-error-boundary/index.tsx +++ /dev/null @@ -1,60 +0,0 @@ -'use client'; - -import React from 'react'; -import { Theme } from '@odigos/ui-theme'; -import { Button } from '@odigos/ui-components'; -import { ErrorBoundary } from 'react-error-boundary'; - -const ErrorFallback = ({ error }: { error: Error }) => { - const theme = Theme.useTheme(); - - return ( -
-

Something went wrong!

- - 
-        {error.message}
-
- -
- Stack Trace - 
{error.stack}
-
- -

Try refreshing the page or contact support.

- -
- ); -}; - -export const AppErrorBoundary = ({ children }: { children: React.ReactNode }) => { - return ( - ( - - - - )} - > - {children} - - ); -}; diff --git a/frontend/webapp/components/common/buttons/index.ts b/frontend/webapp/components/common/buttons/index.ts deleted file mode 100644 index aec6939e64..0000000000 --- a/frontend/webapp/components/common/buttons/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './selection-button'; diff --git a/frontend/webapp/components/common/buttons/selection-button/index.tsx b/frontend/webapp/components/common/buttons/selection-button/index.tsx deleted file mode 100644 index c7d0ed9954..0000000000 --- a/frontend/webapp/components/common/buttons/selection-button/index.tsx +++ /dev/null @@ -1,49 +0,0 @@ -import React from 'react'; -import Image from 'next/image'; -import styled from 'styled-components'; -import { Theme } from '@odigos/ui-theme'; -import { type SVG } from '@odigos/ui-icons'; -import { Badge, Button, Text } from '@odigos/ui-components'; - -interface Props { - label: string; - onClick: () => void; - icon?: SVG; - iconSrc?: string; - badgeLabel?: string | number; - badgeFilled?: boolean; - isSelected?: boolean; - withBorder?: boolean; - color?: React.CSSProperties['backgroundColor']; - hoverColor?: React.CSSProperties['backgroundColor']; - style?: React.CSSProperties; -} - -const StyledButton = styled(Button)<{ $withBorder: Props['withBorder']; $color: Props['color']; $hoverColor: Props['hoverColor'] }>` - gap: 8px; - text-transform: none; - text-decoration: none; - border: ${({ theme, $withBorder }) => `1px solid ${$withBorder ? theme.colors.border : 'transparent'}`}; - &.not-selected { - background-color: ${({ theme, $color }) => $color || theme.colors.dropdown_bg_2 + Theme.hexPercent['060']}; - &:hover { - background-color: ${({ theme, $hoverColor }) => $hoverColor || theme.colors.dropdown_bg_2}; - } - } - &.selected { - background-color: ${({ theme }) => theme.colors.majestic_blue + Theme.hexPercent['048']}; - } -`; - -export const SelectionButton = ({ label, onClick, icon: Icon, iconSrc, badgeLabel, badgeFilled, isSelected, withBorder, color, hoverColor, style }: Props) => { - return ( - - {Icon && } - {iconSrc && } - - {label} - - {badgeLabel !== undefined && } - - ); -}; diff --git a/frontend/webapp/components/common/dropdowns/error-dropdown/index.tsx b/frontend/webapp/components/common/dropdowns/error-dropdown/index.tsx deleted file mode 100644 index 24a155e04c..0000000000 --- a/frontend/webapp/components/common/dropdowns/error-dropdown/index.tsx +++ /dev/null @@ -1,34 +0,0 @@ -import React, { useMemo } from 'react'; -import { useSourceCRUD } from '@/hooks'; -import { CONDITION_STATUS } from '@/utils'; -import { Dropdown, type DropdownProps } from '@odigos/ui-components'; - -interface Props { - title?: string; - value?: DropdownProps['options']; - onSelect: (val: DropdownProps['options'][0]) => void; - onDeselect: (val: DropdownProps['options'][0]) => void; - isMulti?: boolean; - required?: boolean; - showSearch?: boolean; -} - -export const ErrorDropdown: React.FC = ({ title = 'Error Message', value, onSelect, onDeselect, ...props }) => { - const { sources } = useSourceCRUD(); - - const options = useMemo(() => { - const payload: DropdownProps['options'] = []; - - sources.forEach(({ conditions }) => { - conditions?.forEach(({ status, message }) => { - if (status === CONDITION_STATUS.FALSE && !payload.find((opt) => opt.id === message)) { - payload.push({ id: message, value: message }); - } - }); - }); - - return payload; - }, [sources]); - - return ; -}; diff --git a/frontend/webapp/components/common/dropdowns/index.ts b/frontend/webapp/components/common/dropdowns/index.ts deleted file mode 100644 index 13265f2a1a..0000000000 --- a/frontend/webapp/components/common/dropdowns/index.ts +++ /dev/null @@ -1,5 +0,0 @@ -export * from './error-dropdown'; -export * from './language-dropdown'; -export * from './monitor-dropdown'; -export * from './namespace-dropdown'; -export * from './type-dropdown'; diff --git a/frontend/webapp/components/common/dropdowns/language-dropdown/index.tsx b/frontend/webapp/components/common/dropdowns/language-dropdown/index.tsx deleted file mode 100644 index 3acd2de82b..0000000000 --- a/frontend/webapp/components/common/dropdowns/language-dropdown/index.tsx +++ /dev/null @@ -1,33 +0,0 @@ -import React, { useMemo } from 'react'; -import { useSourceCRUD } from '@/hooks'; -import { Dropdown, type DropdownProps } from '@odigos/ui-components'; - -interface Props { - title?: string; - value?: DropdownProps['options']; - onSelect: (val: DropdownProps['options'][0]) => void; - onDeselect: (val: DropdownProps['options'][0]) => void; - isMulti?: boolean; - required?: boolean; - showSearch?: boolean; -} - -export const LanguageDropdown: React.FC = ({ title = 'Programming Languages', value, onSelect, onDeselect, ...props }) => { - const { sources } = useSourceCRUD(); - - const options = useMemo(() => { - const payload: DropdownProps['options'] = []; - - sources.forEach(({ containers }) => { - containers?.forEach(({ language }) => { - if (!payload.find((opt) => opt.id === language)) { - payload.push({ id: language, value: language }); - } - }); - }); - - return payload.sort((a, b) => a.id.localeCompare(b.id)); - }, [sources]); - - return ; -}; diff --git a/frontend/webapp/components/common/dropdowns/monitor-dropdown/index.tsx b/frontend/webapp/components/common/dropdowns/monitor-dropdown/index.tsx deleted file mode 100644 index 07936dfede..0000000000 --- a/frontend/webapp/components/common/dropdowns/monitor-dropdown/index.tsx +++ /dev/null @@ -1,27 +0,0 @@ -import React, { useMemo } from 'react'; -import { MONITORS_OPTIONS } from '@odigos/ui-utils'; -import { Dropdown, type DropdownProps } from '@odigos/ui-components'; - -interface Props { - title?: string; - value?: DropdownProps['options']; - onSelect: (val: DropdownProps['options'][0]) => void; - onDeselect: (val: DropdownProps['options'][0]) => void; - isMulti?: boolean; - required?: boolean; - showSearch?: boolean; -} - -export const MonitorDropdown: React.FC = ({ title = 'Monitors', value, onSelect, onDeselect, ...props }) => { - const options = useMemo(() => { - const payload: DropdownProps['options'] = []; - - MONITORS_OPTIONS.forEach(({ id, value }) => { - if (!payload.find((opt) => opt.id === id)) payload.push({ id, value }); - }); - - return payload; - }, []); - - return ; -}; diff --git a/frontend/webapp/components/common/dropdowns/namespace-dropdown/index.tsx b/frontend/webapp/components/common/dropdowns/namespace-dropdown/index.tsx deleted file mode 100644 index 204b23b425..0000000000 --- a/frontend/webapp/components/common/dropdowns/namespace-dropdown/index.tsx +++ /dev/null @@ -1,31 +0,0 @@ -import React, { useMemo } from 'react'; -import { useNamespace } from '@/hooks'; -import { Dropdown, type DropdownProps } from '@odigos/ui-components'; - -interface Props { - title?: string; - value?: DropdownProps['options'][0]; - onSelect: (val: DropdownProps['options'][0]) => void; - onDeselect: (val: DropdownProps['options'][0]) => void; - isMulti?: boolean; - required?: boolean; - showSearch?: boolean; -} - -export const NamespaceDropdown: React.FC = ({ title = 'Namespace', value, onSelect, onDeselect, ...props }) => { - const { allNamespaces } = useNamespace(); - - const options = useMemo(() => { - const payload: DropdownProps['options'] = []; - - allNamespaces?.forEach(({ name: id }) => { - if (!payload.find((opt) => opt.id === id)) { - payload.push({ id, value: id }); - } - }); - - return payload; - }, [allNamespaces]); - - return ; -}; diff --git a/frontend/webapp/components/common/dropdowns/type-dropdown/index.tsx b/frontend/webapp/components/common/dropdowns/type-dropdown/index.tsx deleted file mode 100644 index 7563c53c24..0000000000 --- a/frontend/webapp/components/common/dropdowns/type-dropdown/index.tsx +++ /dev/null @@ -1,31 +0,0 @@ -import React, { useMemo } from 'react'; -import { useSourceCRUD } from '@/hooks'; -import { Dropdown, type DropdownProps } from '@odigos/ui-components'; - -interface Props { - title?: string; - value?: DropdownProps['options']; - onSelect: (val: DropdownProps['options'][0]) => void; - onDeselect: (val: DropdownProps['options'][0]) => void; - isMulti?: boolean; - required?: boolean; - showSearch?: boolean; -} - -export const TypeDropdown: React.FC = ({ title = 'Type', value, onSelect, onDeselect, ...props }) => { - const { sources } = useSourceCRUD(); - - const options = useMemo(() => { - const payload: DropdownProps['options'] = []; - - sources.forEach(({ kind: id }) => { - if (!payload.find((opt) => opt.id === id)) { - payload.push({ id, value: id }); - } - }); - - return payload; - }, [sources]); - - return ; -}; diff --git a/frontend/webapp/components/common/index.ts b/frontend/webapp/components/common/index.ts deleted file mode 100644 index d656b740a2..0000000000 --- a/frontend/webapp/components/common/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from './buttons'; -export * from './dropdowns'; diff --git a/frontend/webapp/components/index.ts b/frontend/webapp/components/index.ts index c81acf4378..932b15bfda 100644 --- a/frontend/webapp/components/index.ts +++ b/frontend/webapp/components/index.ts @@ -1,6 +1 @@ -export * from './app-error-boundary'; -export * from './common'; -export * from './main'; -export * from './notification'; -export * from './overview'; -export * from './setup'; +export * from './styled'; diff --git a/frontend/webapp/components/lib-imports/overview-header.tsx b/frontend/webapp/components/lib-imports/overview-header.tsx new file mode 100644 index 0000000000..7fdae8ba23 --- /dev/null +++ b/frontend/webapp/components/lib-imports/overview-header.tsx @@ -0,0 +1,42 @@ +import React from 'react'; +import Theme from '@odigos/ui-theme'; +import { SLACK_LINK } from '@/utils'; +import { useStatusStore } from '@/store'; +import { OdigosLogoText, SlackLogo } from '@odigos/ui-icons'; +import { useConfig, useDescribeOdigos, useTokenCRUD } from '@/hooks'; +import { CliDrawer, NotificationManager } from '@odigos/ui-containers'; +import { FORM_ALERTS, NOTIFICATION_TYPE, PLATFORM_TYPE } from '@odigos/ui-utils'; +import { Header, IconButton, PlatformSelect, Status, Tooltip } from '@odigos/ui-components'; + +const OverviewHeader = () => { + const { status, title, message } = useStatusStore(); + + const { data: config } = useConfig(); + const { tokens, updateToken } = useTokenCRUD(); + const { data: describeOdigos } = useDescribeOdigos(); + + return ( +
, + , + , + config?.readonly && ( + + + + ), + ]} + right={[ + , + , + , + window.open(SLACK_LINK, '_blank', 'noopener noreferrer')} tooltip='Join our Slack community'> + + , + ]} + /> + ); +}; + +export default OverviewHeader; diff --git a/frontend/webapp/components/lib-imports/overview-modals-and-drawers.tsx b/frontend/webapp/components/lib-imports/overview-modals-and-drawers.tsx new file mode 100644 index 0000000000..25df7b7880 --- /dev/null +++ b/frontend/webapp/components/lib-imports/overview-modals-and-drawers.tsx @@ -0,0 +1,74 @@ +import React, { useState } from 'react'; +import { type WorkloadId } from '@odigos/ui-utils'; +import { ActionDrawer, ActionModal, DestinationDrawer, DestinationModal, InstrumentationRuleDrawer, InstrumentationRuleModal, SourceDrawer, SourceModal, useDrawerStore } from '@odigos/ui-containers'; +import { + useActionCRUD, + useDescribeOdigos, + useDescribeSource, + useDestinationCategories, + useDestinationCRUD, + useInstrumentationRuleCRUD, + useNamespace, + usePotentialDestinations, + useSourceCRUD, + useTestConnection, +} from '@/hooks'; + +const OverviewModalsAndDrawers = () => { + const { drawerEntityId } = useDrawerStore(); + + const { sources, persistSources, updateSource } = useSourceCRUD(); + const { actions, createAction, updateAction, deleteAction } = useActionCRUD(); + const { destinations, createDestination, updateDestination, deleteDestination } = useDestinationCRUD(); + const { instrumentationRules, createInstrumentationRule, updateInstrumentationRule, deleteInstrumentationRule } = useInstrumentationRuleCRUD(); + + const [selectedNamespace, setSelectedNamespace] = useState(''); + const { allNamespaces, data: namespace, loading: nsLoad } = useNamespace(selectedNamespace); + + const { isPro } = useDescribeOdigos(); + const { categories } = useDestinationCategories(); + const { potentialDestinations } = usePotentialDestinations(); + const { data: testResult, loading: testLoading, testConnection } = useTestConnection(); + const { data: describeSource } = useDescribeSource(typeof drawerEntityId === 'object' ? (drawerEntityId as WorkloadId) : undefined); + + return ( + <> + {/* modals */} + + + + + + {/* drawers */} + + + + + + ); +}; + +export default OverviewModalsAndDrawers; diff --git a/frontend/webapp/components/lib-imports/setup-header.tsx b/frontend/webapp/components/lib-imports/setup-header.tsx new file mode 100644 index 0000000000..b27445e344 --- /dev/null +++ b/frontend/webapp/components/lib-imports/setup-header.tsx @@ -0,0 +1,94 @@ +import React, { Dispatch, SetStateAction, type FC, type RefObject } from 'react'; +import { useRouter } from 'next/navigation'; +import { ROUTES } from '@/utils'; +import Theme from '@odigos/ui-theme'; +import { ENTITY_TYPES } from '@odigos/ui-utils'; +import { useDestinationCRUD, useSourceCRUD } from '@/hooks'; +import { ArrowIcon, OdigosLogoText } from '@odigos/ui-icons'; +import { type FormRef, useSetupStore } from '@odigos/ui-containers'; +import { Header, NavigationButtons, NavigationButtonsProps, Text } from '@odigos/ui-components'; + +interface SetupHeaderProps { + entityType: ENTITY_TYPES; + formRef?: RefObject; // in sources + isLoading?: boolean; // in destinations + setIsLoading?: Dispatch>; // in destinations +} + +const SetupHeader: FC = ({ formRef, entityType, isLoading, setIsLoading }) => { + const router = useRouter(); + const { setAvailableSources, setConfiguredSources, setConfiguredFutureApps } = useSetupStore(); + + const { persistSources } = useSourceCRUD(); + const { createDestination } = useDestinationCRUD(); + const { configuredSources, configuredFutureApps, configuredDestinations, resetState } = useSetupStore(); + + const onNext = () => { + if (formRef?.current) { + const { initial, apps, futureApps } = formRef.current.getFormValues(); + + setAvailableSources(initial); + setConfiguredSources(apps); + setConfiguredFutureApps(futureApps); + + router.push(ROUTES.CHOOSE_DESTINATION); + } + }; + + const onBack = () => { + router.push(ROUTES.CHOOSE_SOURCES); + }; + + const onDone = async () => { + setIsLoading?.(true); + + // configuredSources & configuredFutureApps are set in store from the previous step in onboarding flow + await persistSources(configuredSources, configuredFutureApps); + await Promise.all(configuredDestinations.map(async ({ form }) => await createDestination(form))); + + resetState(); + router.push(ROUTES.OVERVIEW); + }; + + const navButtons: NavigationButtonsProps['buttons'] = + entityType === ENTITY_TYPES.SOURCE + ? [ + { + label: 'NEXT', + icon: ArrowIcon, + onClick: () => onNext(), + variant: 'primary', + }, + ] + : entityType === ENTITY_TYPES.DESTINATION + ? [ + { + label: 'BACK', + icon: ArrowIcon, + variant: 'secondary', + onClick: onBack, + disabled: isLoading, + }, + { + label: 'DONE', + variant: 'primary', + onClick: onDone, + disabled: isLoading, + }, + ] + : []; + + return ( +
]} + center={[ + + START WITH ODIGOS + , + ]} + right={[, ]} + /> + ); +}; + +export default SetupHeader; diff --git a/frontend/webapp/components/main/header/cp-title/index.tsx b/frontend/webapp/components/main/header/cp-title/index.tsx deleted file mode 100644 index efb0445844..0000000000 --- a/frontend/webapp/components/main/header/cp-title/index.tsx +++ /dev/null @@ -1,54 +0,0 @@ -import React from 'react'; -import { K8sLogo } from '@odigos/ui-icons'; -import { Text } from '@odigos/ui-components'; -import { PLATFORM_TYPE } from '@odigos/ui-utils'; -import styled, { useTheme } from 'styled-components'; - -interface Props { - type: PLATFORM_TYPE; -} - -const Container = styled.div` - display: flex; - align-items: center; - gap: 10px; - padding: 4px; - border: 1px solid ${({ theme }) => theme.colors.border}; - border-radius: 32px; -`; - -const Title = styled(Text)` - font-size: 14px; - margin-right: 10px; - color: ${({ theme }) => theme.text.secondary}; -`; - -const LogoWrap = styled.div` - display: flex; - align-items: center; - justify-content: center; - padding: 4px; - border-radius: 100%; - background-color: ${({ theme }) => theme.colors.info}; -`; - -export const PlatformTitle: React.FC = ({ type }) => { - const theme = useTheme(); - - if (type === PLATFORM_TYPE.K8S) { - return ( - - - - - Kubernetes Cluster - - ); - } - - return ( - - Virtual Machine - - ); -}; diff --git a/frontend/webapp/components/main/header/index.tsx b/frontend/webapp/components/main/header/index.tsx deleted file mode 100644 index 39cd25e3bc..0000000000 --- a/frontend/webapp/components/main/header/index.tsx +++ /dev/null @@ -1,70 +0,0 @@ -import React from 'react'; -import { useConfig } from '@/hooks'; -import { Theme } from '@odigos/ui-theme'; -import { PlatformTitle } from './cp-title'; -import { FORM_ALERTS, SLACK_LINK } from '@/utils'; -import { NotificationManager } from '@/components'; -import styled, { useTheme } from 'styled-components'; -import { NOTIFICATION_TYPE, PLATFORM_TYPE } from '@odigos/ui-utils'; -import { OdigosLogoText, SlackLogo, TerminalIcon } from '@odigos/ui-icons'; -import { FlexRow, IconButton, Status, ToggleDarkMode, Tooltip } from '@odigos/ui-components'; -import { DRAWER_OTHER_TYPES, useDarkModeStore, useDrawerStore, useStatusStore } from '@/store'; - -interface MainHeaderProps {} - -const HeaderContainer = styled(FlexRow)` - width: 100%; - padding: 12px 0; - background-color: ${({ theme }) => theme.colors.dark_grey}; - border-bottom: 1px solid ${({ theme }) => theme.colors.border + Theme.hexPercent['050']}; -`; - -const AlignLeft = styled(FlexRow)` - margin-right: auto; - margin-left: 32px; - gap: 16px; -`; - -const AlignRight = styled(FlexRow)` - margin-left: auto; - margin-right: 32px; - gap: 12px; -`; - -export const MainHeader: React.FC = () => { - const theme = useTheme(); - const { data: config } = useConfig(); - const { setSelectedItem } = useDrawerStore(); - const { status, title, message } = useStatusStore(); - const { darkMode, setDarkMode } = useDarkModeStore(); - - const handleClickCli = () => setSelectedItem({ type: DRAWER_OTHER_TYPES.ODIGOS_CLI, id: DRAWER_OTHER_TYPES.ODIGOS_CLI }); - const handleClickSlack = () => window.open(SLACK_LINK, '_blank', 'noopener noreferrer'); - - return ( - - - - - - {config?.readonly && ( - - - - )} - - - - - - - - - - - - - - - ); -}; diff --git a/frontend/webapp/components/main/index.tsx b/frontend/webapp/components/main/index.tsx deleted file mode 100644 index 677ca79d47..0000000000 --- a/frontend/webapp/components/main/index.tsx +++ /dev/null @@ -1 +0,0 @@ -export * from './header'; diff --git a/frontend/webapp/components/nodes-data-flow/edges/labeled-edge.tsx b/frontend/webapp/components/nodes-data-flow/edges/labeled-edge.tsx deleted file mode 100644 index fc955a2c14..0000000000 --- a/frontend/webapp/components/nodes-data-flow/edges/labeled-edge.tsx +++ /dev/null @@ -1,61 +0,0 @@ -import React from 'react'; -import { EDGE_TYPES } from '@/types'; -import styled from 'styled-components'; -import { Tooltip } from '@odigos/ui-components'; -import { EdgeLabelRenderer, BaseEdge, type EdgeProps, type Edge, getSmoothStepPath } from '@xyflow/react'; - -interface Props - extends EdgeProps< - Edge< - { - label: string; - isMultiTarget?: boolean; - isError?: boolean; - }, - EDGE_TYPES.LABELED - > - > {} - -const Label = styled.div<{ $labelX: number; $labelY: number; $isError?: boolean }>` - position: absolute; - transform: ${({ $labelX, $labelY }) => `translate(-50%, -50%) translate(${$labelX}px, ${$labelY}px)`}; - width: 75px; - padding: 2px 6px; - background-color: ${({ theme }) => theme.colors.primary}; - border-radius: 360px; - border: 1px solid ${({ $isError, theme }) => ($isError ? theme.colors.dark_red : theme.colors.border)}; - color: ${({ $isError, theme }) => ($isError ? theme.text.error : theme.text.light_grey)}; - font-family: ${({ theme }) => theme.font_family.secondary}; - font-size: 10px; - font-weight: 400; - text-transform: uppercase; - display: flex; - align-items: center; - justify-content: center; -`; - -const LabeledEdge: React.FC = ({ id, sourceX, sourceY, targetX, targetY, sourcePosition, targetPosition, data, style }) => { - const [edgePath] = getSmoothStepPath({ - sourceX, - sourceY, - sourcePosition, - targetX, - targetY, - targetPosition, - }); - - return ( - <> - - - - - - - - ); -}; - -export default LabeledEdge; diff --git a/frontend/webapp/components/nodes-data-flow/index.tsx b/frontend/webapp/components/nodes-data-flow/index.tsx deleted file mode 100644 index d772d531c1..0000000000 --- a/frontend/webapp/components/nodes-data-flow/index.tsx +++ /dev/null @@ -1,91 +0,0 @@ -import React from 'react'; -import '@xyflow/react/dist/style.css'; -import styled from 'styled-components'; -import AddNode from './nodes/add-node'; -import BaseNode from './nodes/base-node'; -import EdgedNode from './nodes/edged-node'; -import FrameNode from './nodes/frame-node'; -import ScrollNode from './nodes/scroll-node'; -import HeaderNode from './nodes/header-node'; -import LabeledEdge from './edges/labeled-edge'; -import SkeletonNode from './nodes/skeleton-node'; -import { EDGE_TYPES, NODE_TYPES } from '@/types'; -import { Controls, type Edge, type Node, type OnEdgesChange, type OnNodesChange, ReactFlow } from '@xyflow/react'; - -interface Props { - nodes: Node[]; - edges: Edge[]; - onNodeClick?: (event: React.MouseEvent, object: Node) => void; - onNodesChange?: OnNodesChange; - onEdgesChange?: OnEdgesChange; -} - -const FlowWrapper = styled.div` - height: calc(100vh - 160px); - .react-flow__attribution { - visibility: hidden; - } -`; - -const ControllerWrapper = styled.div` - button { - padding: 8px; - margin: 8px; - border-radius: 8px; - border: 1px solid ${({ theme }) => theme.colors.border} !important; - background-color: ${({ theme }) => theme.colors.dropdown_bg}; - path { - fill: ${({ theme }) => theme.text.secondary}; - } - &:hover { - background-color: ${({ theme }) => theme.colors.dropdown_bg_2}; - } - } -`; - -const nodeTypes = { - [NODE_TYPES.HEADER]: HeaderNode, - [NODE_TYPES.ADD]: AddNode, - [NODE_TYPES.BASE]: BaseNode, - [NODE_TYPES.EDGED]: EdgedNode, - [NODE_TYPES.FRAME]: FrameNode, - [NODE_TYPES.SCROLL]: ScrollNode, - [NODE_TYPES.SKELETON]: SkeletonNode, -}; - -const edgeTypes = { - [EDGE_TYPES.LABELED]: LabeledEdge, -}; - -export const NodeDataFlow: React.FC = ({ nodes, edges, onNodeClick, onNodesChange, onEdgesChange }) => { - return ( - - - - - - - - ); -}; diff --git a/frontend/webapp/components/nodes-data-flow/nodes/add-node.tsx b/frontend/webapp/components/nodes-data-flow/nodes/add-node.tsx deleted file mode 100644 index a65bfc42c9..0000000000 --- a/frontend/webapp/components/nodes-data-flow/nodes/add-node.tsx +++ /dev/null @@ -1,95 +0,0 @@ -import React, { Fragment } from 'react'; -import styled from 'styled-components'; -import { Theme } from '@odigos/ui-theme'; -import { usePendingStore } from '@/store'; -import { PlusIcon } from '@odigos/ui-icons'; -import { NODE_TYPES, OVERVIEW_NODE_TYPES } from '@/types'; -import { ENTITY_TYPES, HEALTH_STATUS } from '@odigos/ui-utils'; -import { Handle, type Node, type NodeProps, Position } from '@xyflow/react'; -import { FadeLoader, FlexColumn, FlexRow, Text } from '@odigos/ui-components'; - -interface Props - extends NodeProps< - Node< - { - nodeWidth: number; - - type: OVERVIEW_NODE_TYPES; - status: HEALTH_STATUS; - title: string; - subTitle: string; - }, - NODE_TYPES.ADD - > - > {} - -const Container = styled(FlexColumn)<{ $nodeWidth: Props['data']['nodeWidth'] }>` - min-height: 50px; - // negative width applied here because of the padding left&right - width: ${({ $nodeWidth }) => `${$nodeWidth - 40}px`}; - padding: 16px 24px 16px 16px; - align-items: center; - justify-content: center; - gap: 4px; - align-self: stretch; - cursor: pointer; - background-color: transparent; - border-radius: 16px; - border: 1px dashed ${({ theme }) => theme.colors.border}; - - &:hover { - background-color: ${({ theme }) => theme.colors.dropdown_bg_2 + Theme.hexPercent['030']}; - } -`; - -const TitleWrapper = styled(FlexRow)` - gap: 4px; -`; - -const Title = styled(Text)` - font-size: 14px; - font-weight: 600; -`; - -const SubTitle = styled(Text)` - font-size: 12px; - color: ${({ theme }) => theme.text.grey}; - text-align: center; -`; - -const AddNode: React.FC = ({ id: nodeId, data }) => { - const { nodeWidth, title, subTitle } = data; - - const { isThisPending } = usePendingStore(); - const entity = nodeId.split('-')[0] as ENTITY_TYPES; - const isPending = isThisPending({ entityType: entity }); - - return ( - - {isPending ? ( - - - - adding {entity}s - - Just a few more seconds... - - ) : ( - - - - - {title} - - - {subTitle} - - )} - - - - - ); -}; - -export default AddNode; diff --git a/frontend/webapp/components/nodes-data-flow/nodes/base-node.tsx b/frontend/webapp/components/nodes-data-flow/nodes/base-node.tsx deleted file mode 100644 index 4be76167e8..0000000000 --- a/frontend/webapp/components/nodes-data-flow/nodes/base-node.tsx +++ /dev/null @@ -1,79 +0,0 @@ -import React from 'react'; -import styled from 'styled-components'; -import { CONDITION_STATUS } from '@/utils'; -import { useAppStore, usePendingStore } from '@/store'; -import { ErrorTriangleIcon, type SVG } from '@odigos/ui-icons'; -import { Checkbox, DataTab, FadeLoader } from '@odigos/ui-components'; -import { Handle, type Node, type NodeProps, Position } from '@xyflow/react'; -import { ENTITY_TYPES, HEALTH_STATUS, SIGNAL_TYPE, type WorkloadId } from '@odigos/ui-utils'; -import { type ActionDataParsed, type ActualDestination, type InstrumentationRuleSpec, type K8sActualSource, NODE_TYPES } from '@/types'; - -interface Props - extends NodeProps< - Node< - { - nodeWidth: number; - id: string | WorkloadId; - type: ENTITY_TYPES; - status: HEALTH_STATUS; - title: string; - subTitle: string; - icon?: SVG; - iconSrc?: string; - monitors?: SIGNAL_TYPE[]; - isActive?: boolean; - raw: InstrumentationRuleSpec | K8sActualSource | ActionDataParsed | ActualDestination; - }, - NODE_TYPES.BASE - > - > {} - -const Container = styled.div<{ $nodeWidth: Props['data']['nodeWidth'] }>` - width: ${({ $nodeWidth }) => `${$nodeWidth}px`}; -`; - -const BaseNode: React.FC = ({ id: nodeId, data }) => { - const { nodeWidth, id: entityId, type: entityType, status, title, subTitle, icon, iconSrc, monitors, isActive, raw } = data; - const isError = status === HEALTH_STATUS.UNHEALTHY; - const isSource = entityType === ENTITY_TYPES.SOURCE; - - const { configuredSources, setConfiguredSources } = useAppStore(); - const { isThisPending } = usePendingStore(); - const isPending = isThisPending({ entityType, entityId }); - - const renderActions = () => { - const { namespace, name, kind } = raw as K8sActualSource; - const sources = { ...configuredSources }; - if (!sources[namespace]) sources[namespace] = []; - - const index = sources[namespace].findIndex((x) => x.name === name && x.kind === kind); - - const onSelectSource = () => { - if (index === -1) { - sources[namespace].push(raw as K8sActualSource); - } else { - sources[namespace].splice(index, 1); - } - - setConfiguredSources(sources); - }; - - return ( - <> - {/* TODO: handle action/icon to apply instrumentation-rules for individual sources (@Notion GEN-1650) */} - {isPending || (isSource && (raw as K8sActualSource).conditions?.every(({ status }) => status === CONDITION_STATUS.UNKNOWN)) ? : isError ? : null} - {isSource ? : null} - - ); - }; - - return ( - - {}} renderActions={renderActions} /> - - - - ); -}; - -export default BaseNode; diff --git a/frontend/webapp/components/nodes-data-flow/nodes/edged-node.tsx b/frontend/webapp/components/nodes-data-flow/nodes/edged-node.tsx deleted file mode 100644 index c90cfd27ac..0000000000 --- a/frontend/webapp/components/nodes-data-flow/nodes/edged-node.tsx +++ /dev/null @@ -1,34 +0,0 @@ -import React from 'react'; -import { NODE_TYPES } from '@/types'; -import styled from 'styled-components'; -import { Handle, type Node, type NodeProps, Position } from '@xyflow/react'; - -interface Props - extends NodeProps< - Node< - { - nodeWidth: number; - nodeHeight: number; - }, - NODE_TYPES.EDGED - > - > {} - -const Container = styled.div<{ $nodeWidth: Props['data']['nodeWidth']; $nodeHeight: Props['data']['nodeHeight'] }>` - width: ${({ $nodeWidth }) => `${$nodeWidth}px`}; - height: ${({ $nodeHeight }) => `${$nodeHeight}px`}; - opacity: 0; -`; - -const EdgedNode: React.FC = ({ data }) => { - const { nodeWidth, nodeHeight } = data; - - return ( - - - - - ); -}; - -export default EdgedNode; diff --git a/frontend/webapp/components/nodes-data-flow/nodes/frame-node.tsx b/frontend/webapp/components/nodes-data-flow/nodes/frame-node.tsx deleted file mode 100644 index 6c06e63692..0000000000 --- a/frontend/webapp/components/nodes-data-flow/nodes/frame-node.tsx +++ /dev/null @@ -1,36 +0,0 @@ -import React from 'react'; -import { NODE_TYPES } from '@/types'; -import styled from 'styled-components'; -import { Handle, type Node, type NodeProps, Position } from '@xyflow/react'; - -interface Props - extends NodeProps< - Node< - { - nodeWidth: number; - nodeHeight: number; - }, - NODE_TYPES.FRAME - > - > {} - -const Container = styled.div<{ $nodeWidth: Props['data']['nodeWidth']; $nodeHeight: Props['data']['nodeHeight'] }>` - width: ${({ $nodeWidth }) => $nodeWidth}px; - height: ${({ $nodeHeight }) => $nodeHeight}px; - background: transparent; - border: 1px dashed ${({ theme }) => theme.colors.border}; - border-radius: 24px; -`; - -const FrameNode: React.FC = ({ data }) => { - const { nodeWidth, nodeHeight } = data; - - return ( - - - - - ); -}; - -export default FrameNode; diff --git a/frontend/webapp/components/nodes-data-flow/nodes/header-node.tsx b/frontend/webapp/components/nodes-data-flow/nodes/header-node.tsx deleted file mode 100644 index d87705a670..0000000000 --- a/frontend/webapp/components/nodes-data-flow/nodes/header-node.tsx +++ /dev/null @@ -1,105 +0,0 @@ -import React, { useMemo } from 'react'; -import styled from 'styled-components'; -import { ENTITY_TYPES } from '@odigos/ui-utils'; -import type { Node, NodeProps } from '@xyflow/react'; -import { K8sActualSource, NODE_TYPES } from '@/types'; -import { useAppStore, usePendingStore } from '@/store'; -import { usePaginatedSources, useSourceCRUD } from '@/hooks'; -import { Badge, Checkbox, FadeLoader, Text } from '@odigos/ui-components'; - -interface Props - extends NodeProps< - Node< - { - nodeWidth: number; - icon: string; - title: string; - tagValue: string | number; - }, - NODE_TYPES.HEADER - > - > {} - -const Container = styled.div<{ $nodeWidth: Props['data']['nodeWidth'] }>` - width: ${({ $nodeWidth }) => `${$nodeWidth}px`}; - padding: 12px 0px 16px 0px; - gap: 8px; - display: flex; - align-items: center; - border-bottom: 1px solid ${({ theme }) => theme.colors.border}; -`; - -const Title = styled(Text)` - color: ${({ theme }) => theme.text.grey}; -`; - -const ActionsWrapper = styled.div` - margin-left: auto; - margin-right: 16px; -`; - -const HeaderNode: React.FC = ({ data }) => { - const { nodeWidth, title, icon: Icon, tagValue } = data; - const isSources = title === 'Sources'; - - const { configuredSources, setConfiguredSources } = useAppStore(); - const { sourcesFetching } = usePaginatedSources(); - const { isThisPending } = usePendingStore(); - const { sources } = useSourceCRUD(); - - const totalSelectedSources = useMemo(() => { - let num = 0; - - Object.values(configuredSources).forEach((selectedSources) => { - num += selectedSources.length; - }); - - return num; - }, [configuredSources]); - - const renderActions = () => { - if (!isSources || !sources.length) return null; - - const onSelect = (bool: boolean) => { - if (bool) { - const payload: Record = {}; - - sources.forEach((source) => { - const id = { namespace: source.namespace, name: source.name, kind: source.kind }; - const isPending = isThisPending({ entityType: ENTITY_TYPES.SOURCE, entityId: id }); - - if (!isPending) { - if (!payload[source.namespace]) { - payload[source.namespace] = [source]; - } else { - payload[source.namespace].push(source); - } - } - }); - - setConfiguredSources(payload); - } else { - setConfiguredSources({}); - } - }; - - return ( - - - - ); - }; - - return ( - - {Icon && } - {title} - - {isSources && sourcesFetching && } - - {renderActions()} - - ); -}; - -export default HeaderNode; diff --git a/frontend/webapp/components/nodes-data-flow/nodes/scroll-node.tsx b/frontend/webapp/components/nodes-data-flow/nodes/scroll-node.tsx deleted file mode 100644 index 70bb327c85..0000000000 --- a/frontend/webapp/components/nodes-data-flow/nodes/scroll-node.tsx +++ /dev/null @@ -1,145 +0,0 @@ -import React, { useEffect, useRef, useState } from 'react'; -import BaseNode from './base-node'; -import styled from 'styled-components'; -import { type SVG } from '@odigos/ui-icons'; -import { useNodeDataFlowHandlers } from '@/hooks'; -import { type Node, type NodeProps } from '@xyflow/react'; -import { type K8sActualSource, NODE_TYPES } from '@/types'; -import { ENTITY_TYPES, HEALTH_STATUS, type WorkloadId } from '@odigos/ui-utils'; - -interface Props - extends NodeProps< - Node< - { - nodeWidth: number; - nodeHeight: number; - items: NodeProps< - Node< - { - nodeWidth: number; - framePadding: number; - id: WorkloadId; - type: ENTITY_TYPES; - status: HEALTH_STATUS; - title: string; - subTitle: string; - icon?: SVG; - iconSrc?: string; - raw: K8sActualSource; - }, - NODE_TYPES.BASE - > - >[]; - onScroll: (params: { clientHeight: number; scrollHeight: number; scrollTop: number }) => void; - }, - NODE_TYPES.SCROLL - > - > {} - -const Container = styled.div<{ $nodeWidth: number; $nodeHeight: number }>` - position: relative; - width: ${({ $nodeWidth }) => $nodeWidth}px; - height: ${({ $nodeHeight }) => $nodeHeight}px; - background: transparent; - border: none; - overflow-y: auto; -`; - -const BaseNodeWrapper = styled.div<{ $framePadding: number }>` - margin: ${({ $framePadding }) => $framePadding}px 0; -`; - -const LoadMoreWrapper = styled.div<{ $hide?: boolean }>` - position: fixed; - bottom: 0; - left: 50%; - transform: translateX(-50%); - - width: 100%; - height: 100px; - padding-bottom: 12px; - - background: ${({ theme, $hide }) => ($hide ? 'transparent' : `linear-gradient(to top, ${theme.colors.primary}, transparent)`)}; - display: flex; - align-items: flex-end; - justify-content: center; - - pointer-events: none; -`; - -// const LoadMoreButton = styled(Button)` -// background: ${({ theme }) => theme.colors.primary} !important; -// &:hover { -// background: ${({ theme }) => theme.colors.dropdown_bg_2} !important; -// } -// `; - -const ScrollNode: React.FC = ({ data, ...rest }) => { - const { nodeWidth, nodeHeight, items, onScroll } = data; - - const { handleNodeClick } = useNodeDataFlowHandlers(); - // const { fetchSources, sourcesNotFinished } = usePaginatedSources(); - const containerRef = useRef(null); - const [isBottomOfList, setIsBottomOfList] = useState(false); - - useEffect(() => { - const handleScroll = (e: Event) => { - e.stopPropagation(); - - // @ts-ignore - these properties are available on the EventTarget, TS is not aware of it - const { clientHeight, scrollHeight, scrollTop } = e.target || { clientHeight: 0, scrollHeight: 0, scrollTop: 0 }; - - if (!!onScroll) onScroll({ clientHeight, scrollHeight, scrollTop }); - - // TODO: Use the following if we have to handle paginated API requests using scroll: - // const isTop = scrollTop === 0; - const isBottom = scrollHeight - scrollTop <= clientHeight; - // if (isTop) { - // console.log('Reached top of scroll-node'); - // } else if (isBottom) { - // console.log('Reached bottom of scroll-node'); - // } - - setIsBottomOfList(isBottom); - }; - - const { current } = containerRef; - - current?.addEventListener('scroll', handleScroll); - return () => current?.removeEventListener('scroll', handleScroll); - }, [onScroll]); - - return ( - - {items.map((item) => ( - { - e.stopPropagation(); - // @ts-ignore - handleNodeClick(e, item); - }} - > - - - ))} - - - {/* {sourcesNotFinished && ( - { - e.stopPropagation(); - fetchSources(true); - }} - > - load more - - )} */} - - - ); -}; - -export default ScrollNode; diff --git a/frontend/webapp/components/nodes-data-flow/nodes/skeleton-node.tsx b/frontend/webapp/components/nodes-data-flow/nodes/skeleton-node.tsx deleted file mode 100644 index 40c417e8c4..0000000000 --- a/frontend/webapp/components/nodes-data-flow/nodes/skeleton-node.tsx +++ /dev/null @@ -1,32 +0,0 @@ -import React from 'react'; -import { NODE_TYPES } from '@/types'; -import styled from 'styled-components'; -import { SkeletonLoader } from '@odigos/ui-components'; -import { type Node, type NodeProps } from '@xyflow/react'; - -interface Props - extends NodeProps< - Node< - { - nodeWidth: number; - size: number; - }, - NODE_TYPES.SKELETON - > - > {} - -const Container = styled.div<{ $nodeWidth: Props['data']['nodeWidth'] }>` - width: ${({ $nodeWidth }) => `${$nodeWidth}px`}; -`; - -const SkeletonNode: React.FC = ({ id: nodeId, data }) => { - const { nodeWidth, size } = data; - - return ( - - - - ); -}; - -export default SkeletonNode; diff --git a/frontend/webapp/components/notification/index.ts b/frontend/webapp/components/notification/index.ts deleted file mode 100644 index f3993ea5b5..0000000000 --- a/frontend/webapp/components/notification/index.ts +++ /dev/null @@ -1,4 +0,0 @@ -export * from './notification-manager'; -import ToastList from './toast-list'; - -export { ToastList }; diff --git a/frontend/webapp/components/notification/notification-manager.tsx b/frontend/webapp/components/notification/notification-manager.tsx deleted file mode 100644 index 87b1ad951d..0000000000 --- a/frontend/webapp/components/notification/notification-manager.tsx +++ /dev/null @@ -1,201 +0,0 @@ -import React, { useRef, useState } from 'react'; -import { ACTION } from '@/utils'; -import { useClickNotif } from '@/hooks'; -import { Theme } from '@odigos/ui-theme'; -import { type Notification } from '@/types'; -import { useNotificationStore } from '@/store'; -import styled, { useTheme } from 'styled-components'; -import { NotificationIcon, TrashIcon } from '@odigos/ui-icons'; -import { IconButton, NoDataFound, Text } from '@odigos/ui-components'; -import { getStatusIcon, NOTIFICATION_TYPE, useOnClickOutside, useTimeAgo } from '@odigos/ui-utils'; - -const RelativeContainer = styled.div` - position: relative; -`; - -const AbsoluteContainer = styled.div` - position: absolute; - top: 40px; - right: 0; - z-index: 1; - width: 370px; - height: 400px; - background-color: ${({ theme }) => theme.colors.dropdown_bg}; - border: 1px solid ${({ theme }) => theme.colors.border}; - border-radius: 24px; - box-shadow: 0px 10px 15px -3px ${({ theme }) => theme.colors.primary}, 0px 4px 6px -2px ${({ theme }) => theme.colors.primary}; -`; - -const PopupHeader = styled.div` - display: flex; - align-items: center; - gap: 12px; - padding: 12px 24px; - border-bottom: 1px solid ${({ theme }) => theme.colors.border}; -`; - -const PopupBody = styled.div` - display: flex; - flex-direction: column; - gap: 12px; - padding: 12px; - height: calc(100% - 74px); - border-radius: 24px; - overflow-y: auto; -`; - -const PopupShadow = styled.div` - position: absolute; - bottom: 0; - left: 0; - width: 100%; - height: 45px; - border-radius: 0 0 24px 24px; - background: ${({ theme }) => `linear-gradient(to top, ${theme.colors.dropdown_bg}, transparent)`}; - pointer-events: none; -`; - -const NewCount = styled(Text)` - background-color: ${({ theme }) => theme.colors.orange_soft}; - color: ${({ theme }) => theme.text.primary}; - border-radius: 32px; - width: fit-content; - padding: 2px 8px; -`; - -export const NotificationManager = () => { - const theme = useTheme(); - - const { notifications: n, markAsSeen } = useNotificationStore(); - const notifications = n.filter(({ hideFromHistory }) => !hideFromHistory); - const unseen = notifications.filter(({ seen }) => !seen); - const unseenCount = unseen.length; - - const [isOpen, setIsOpen] = useState(false); - const toggleOpen = () => setIsOpen((prev) => !prev); - - const containerRef = useRef(null); - - useOnClickOutside(containerRef, () => { - if (isOpen) { - setIsOpen(false); - if (!!unseenCount) unseen.forEach(({ id }) => markAsSeen(id)); - } - }); - - return ( - - - - - - {isOpen && ( - - - Notifications - {!!unseenCount && ( - - {unseenCount} new - - )} - - - {!notifications.length ? ( - - ) : ( - notifications.map((notif) => setIsOpen(false)} />) - )} - - - - )} - - ); -}; - -const NotifCard = styled.div` - display: flex; - align-items: flex-start; - gap: 12px; - padding: 16px; - border-radius: 16px; - background-color: ${({ theme }) => theme.colors.dropdown_bg_2 + Theme.hexPercent['080']}; - cursor: not-allowed; - &.click-enabled { - cursor: pointer; - &:hover { - background-color: ${({ theme }) => theme.colors.dropdown_bg_2}; - } - } -`; - -const StatusIcon = styled.div<{ $type: NOTIFICATION_TYPE }>` - background-color: ${({ $type, theme }) => theme.text[$type] + Theme.hexPercent['015']}; - border-radius: 8px; - width: 36px; - height: 36px; - display: flex; - align-items: center; - justify-content: center; -`; - -const NotifTextWrap = styled.div` - width: 290px; -`; - -const NotifHeaderTextWrap = styled.div` - margin-bottom: 6px; -`; - -const NotifFooterTextWrap = styled.div` - display: flex; - align-items: center; - gap: 6px; -`; - -const NotificationListItem: React.FC void }> = ({ onClick, ...props }) => { - const theme = useTheme(); - - const { id, seen, type, title, message, time, crdType, target } = props; - const canClick = !!crdType && !!target; - - const isDeleted = title?.toLowerCase().includes(ACTION.DELETE.toLowerCase()) || false; - const Icon = getStatusIcon(type); - const timeAgo = useTimeAgo(); - const clickNotif = useClickNotif(); - - return ( - { - if (canClick) { - onClick(); // this is to close the popup in a controlled manner, to prevent from all notifications being marked as "seen" - clickNotif(props); - } - }} - > - {isDeleted ? : } - - - - {message} - - - - - {timeAgo.format(new Date(time))} - - {!seen && ( - <> - · - - new - - - )} - - - - ); -}; diff --git a/frontend/webapp/components/notification/toast-list.tsx b/frontend/webapp/components/notification/toast-list.tsx deleted file mode 100644 index 9ba9a1abee..0000000000 --- a/frontend/webapp/components/notification/toast-list.tsx +++ /dev/null @@ -1,63 +0,0 @@ -import React from 'react'; -import styled from 'styled-components'; -import { Notification } from '@/types'; -import { useClickNotif } from '@/hooks'; -import { useNotificationStore } from '@/store'; -import { NotificationNote } from '@odigos/ui-components'; - -const Container = styled.div` - position: fixed; - top: 14px; - left: 50%; - transform: translateX(-50%); - z-index: 10000; - display: flex; - flex-direction: column-reverse; - gap: 6px; - min-width: 600px; -`; - -const ToastList: React.FC = () => { - const { notifications } = useNotificationStore(); - - return ( - - {notifications - .filter(({ dismissed }) => !dismissed) - .map((notif) => ( - - ))} - - ); -}; - -const Toast: React.FC = (props) => { - const { id, type, title, message, crdType, target } = props; - const { markAsDismissed, markAsSeen } = useNotificationStore(); - const clickNotif = useClickNotif(); - - const onClose = ({ asSeen }: { asSeen: boolean }) => { - markAsDismissed(id); - if (asSeen) markAsSeen(id); - }; - - return ( - clickNotif(props, { dismissToast: true }), - } - : undefined - } - onClose={onClose} - /> - ); -}; - -export default ToastList; diff --git a/frontend/webapp/components/overview/add-entity/index.tsx b/frontend/webapp/components/overview/add-entity/index.tsx deleted file mode 100644 index 3380ba877c..0000000000 --- a/frontend/webapp/components/overview/add-entity/index.tsx +++ /dev/null @@ -1,129 +0,0 @@ -import React, { useState, useRef, useEffect } from 'react'; -import { useModalStore } from '@/store'; -import { Theme } from '@odigos/ui-theme'; -import { PlusIcon } from '@odigos/ui-icons'; -import styled, { css, useTheme } from 'styled-components'; -import { Button, type DropdownProps, Text } from '@odigos/ui-components'; -import { ENTITY_TYPES, getEntityIcon, useOnClickOutside } from '@odigos/ui-utils'; - -// Styled components for the dropdown UI -const Container = styled.div` - position: relative; - display: inline-block; -`; - -const StyledButton = styled(Button)` - display: flex; - align-items: center; - justify-content: center; - gap: 6px; - min-width: 160px; - padding-right: 24px; -`; - -const DropdownListContainer = styled.div` - position: absolute; - right: 0; - top: 42px; - border-radius: 24px; - width: 200px; - overflow-y: auto; - background-color: ${({ theme }) => theme.colors.secondary}; - border: 1px solid ${({ theme }) => theme.colors.border}; - z-index: 9999; - padding: 12px; -`; - -const DropdownItem = styled.div<{ $selected: boolean }>` - padding: 8px 12px; - cursor: pointer; - border-radius: 24px; - gap: 8px; - display: flex; - align-items: center; - &:hover { - background: ${({ theme }) => theme.text.grey + Theme.hexPercent['050']}; - } - ${({ $selected, theme }) => - $selected && - css` - background: ${theme.colors.majestic_blue + Theme.hexPercent['024']}; - `} -`; - -const ButtonText = styled(Text)` - color: ${({ theme }) => theme.text.primary}; - font-family: ${({ theme }) => theme.font_family.secondary}; - font-weight: 600; -`; - -// Default options for the dropdown -const DEFAULT_OPTIONS: DropdownProps['options'] = [ - { id: ENTITY_TYPES.INSTRUMENTATION_RULE, value: 'Instrumentation Rule' }, - { id: ENTITY_TYPES.SOURCE, value: 'Source' }, - { id: ENTITY_TYPES.ACTION, value: 'Action' }, - { id: ENTITY_TYPES.DESTINATION, value: 'Destination' }, -]; - -interface Props { - options?: DropdownProps['options']; - placeholder?: string; -} - -export const AddEntity: React.FC = ({ options = DEFAULT_OPTIONS, placeholder = 'ADD NEW' }) => { - const theme = useTheme(); - const { currentModal, setCurrentModal } = useModalStore(); - - const [isDropdownOpen, setIsDropdownOpen] = useState(false); - const dropdownRef = useRef(null); - - useOnClickOutside(dropdownRef, () => setIsDropdownOpen(false)); - - useEffect(() => { - if (dropdownRef.current) { - const { current: c } = dropdownRef; - - const handleOpen = () => setIsDropdownOpen(true); - const handleClose = () => setIsDropdownOpen(false); - - c.addEventListener('mouseenter', handleOpen); - c.addEventListener('mouseleave', handleClose); - - return () => { - c.removeEventListener('mouseenter', handleOpen); - c.removeEventListener('mouseleave', handleClose); - }; - } - }, []); - - const handleSelect = (option: DropdownProps['options'][0]) => { - setCurrentModal(option.id); - setIsDropdownOpen(false); // ??? maybe remove this line (for fast-toggle between modals) - }; - - return ( - - - - {placeholder} - - - {isDropdownOpen && ( - - {options.map((option) => { - const Icon = getEntityIcon(option.id as ENTITY_TYPES); - - return ( - handleSelect(option)}> - - - {option.value} - - - ); - })} - - )} - - ); -}; diff --git a/frontend/webapp/components/overview/all-drawers/cli-drawer.tsx b/frontend/webapp/components/overview/all-drawers/cli-drawer.tsx deleted file mode 100644 index a0773e4599..0000000000 --- a/frontend/webapp/components/overview/all-drawers/cli-drawer.tsx +++ /dev/null @@ -1,189 +0,0 @@ -import React, { useRef, useState } from 'react'; -import { useDrawerStore } from '@/store'; -import styled, { useTheme } from 'styled-components'; -import { DATA_CARDS, SEVEN_DAYS_IN_MS } from '@/utils'; -import { useDescribeOdigos, useTokenCRUD } from '@/hooks'; -import { CheckIcon, CodeBracketsIcon, CodeIcon, CopyIcon, CrossIcon, EditIcon, KeyIcon, ListIcon } from '@odigos/ui-icons'; -import { getStatusIcon, isOverTime, NOTIFICATION_TYPE, safeJsonStringify, useCopy, useKeyDown, useOnClickOutside, useTimeAgo } from '@odigos/ui-utils'; -import { Button, DATA_CARD_FIELD_TYPES, DataCard, Divider, Drawer, FlexColumn, FlexRow, IconButton, Input, Segment, Text, Tooltip } from '@odigos/ui-components'; - -interface Props {} - -const DataContainer = styled.div` - display: flex; - flex-direction: column; - gap: 12px; -`; - -const Relative = styled.div` - position: relative; -`; - -const TokenPopover = styled(FlexColumn)` - position: absolute; - top: 32px; - right: 0; - z-index: 1; - gap: 8px; - padding: 24px; - background-color: ${({ theme }) => theme.colors.info}; - border: 1px solid ${({ theme }) => theme.colors.border}; - border-radius: 24px; -`; - -const PopoverFormWrapper = styled(FlexRow)` - width: 100%; -`; - -const PopoverFormButton = styled(Button)` - width: 36px; - padding-left: 0; - padding-right: 0; -`; - -const DRAWER_WIDTH = '750px'; - -export const CliDrawer: React.FC = () => { - const theme = useTheme(); - const timeAgo = useTimeAgo(); - const { setSelectedItem } = useDrawerStore(); - const { isCopied, copiedIndex, clickCopy } = useCopy(); - const { tokens, loading, updateToken } = useTokenCRUD(); - const { data: describe, restructureForPrettyMode } = useDescribeOdigos(); - - const [isPrettyMode, setIsPrettyMode] = useState(true); - const [editTokenIndex, setEditTokenIndex] = useState(-1); - - const tokenPopoverRef = useRef(null); - const tokenInputRef = useRef(null); - useOnClickOutside(tokenPopoverRef, () => setEditTokenIndex(-1)); - useKeyDown({ key: 'Enter', active: editTokenIndex !== -1 }, saveToken); - - function saveToken() { - const token = tokenInputRef.current?.value; - if (token) updateToken(token).then(() => setEditTokenIndex(-1)); - } - - const closeDrawer = () => { - setSelectedItem(null); - }; - - return ( - - - {!!tokens?.length && ( - [ - { columnKey: 'icon', icon: KeyIcon }, - { columnKey: 'name', value: name }, - { columnKey: 'token', value: `${new Array(15).fill('•').join('')}` }, - { - columnKey: 'expires_at', - component: () => { - return ( - - {timeAgo.format(expiresAt)} ({new Date(expiresAt).toDateString().split(' ').slice(1).join(' ')}) - - ); - }, - }, - { - columnKey: 'actions', - component: () => { - const SuccessIcon = getStatusIcon(NOTIFICATION_TYPE.SUCCESS); - - return ( - - clickCopy(token, idx)}> - {isCopied && copiedIndex === idx ? : } - - - - - setEditTokenIndex(idx)}> - - - - {editTokenIndex === idx && ( - - - - Enter a new API Token: - - - - - - - - setEditTokenIndex(-1)}> - - - - - )} - - - ); - }, - }, - ]), - }, - width: 'inherit', - }, - ]} - /> - )} - - - } - data={[ - { - type: DATA_CARD_FIELD_TYPES.CODE, - value: JSON.stringify({ - language: 'json', - code: safeJsonStringify(isPrettyMode ? restructureForPrettyMode(describe) : describe), - pretty: isPrettyMode, - }), - width: 'inherit', - }, - ]} - /> - - - ); -}; diff --git a/frontend/webapp/components/overview/all-drawers/index.tsx b/frontend/webapp/components/overview/all-drawers/index.tsx deleted file mode 100644 index f1101d658d..0000000000 --- a/frontend/webapp/components/overview/all-drawers/index.tsx +++ /dev/null @@ -1,33 +0,0 @@ -import React from 'react'; -import { CliDrawer } from './cli-drawer'; -import { ENTITY_TYPES } from '@odigos/ui-utils'; -import { DRAWER_OTHER_TYPES, useDrawerStore } from '@/store'; -import { ActionDrawer, DestinationDrawer, RuleDrawer, SourceDrawer } from '@/containers'; - -const AllDrawers = () => { - const selected = useDrawerStore(({ selectedItem }) => selectedItem); - - if (!selected?.type) return null; - - switch (selected.type) { - case ENTITY_TYPES.INSTRUMENTATION_RULE: - return ; - - case ENTITY_TYPES.SOURCE: - return ; - - case ENTITY_TYPES.ACTION: - return ; - - case ENTITY_TYPES.DESTINATION: - return ; - - case DRAWER_OTHER_TYPES.ODIGOS_CLI: - return ; - - default: - return <>; - } -}; - -export default AllDrawers; diff --git a/frontend/webapp/components/overview/all-modals/index.tsx b/frontend/webapp/components/overview/all-modals/index.tsx deleted file mode 100644 index ebf477af19..0000000000 --- a/frontend/webapp/components/overview/all-modals/index.tsx +++ /dev/null @@ -1,32 +0,0 @@ -import React from 'react'; -import { useModalStore } from '@/store'; -import { ENTITY_TYPES } from '@odigos/ui-utils'; -import { ActionModal, AddSourceModal, DestinationModal, RuleModal } from '@/containers'; - -const AllModals = () => { - const selected = useModalStore(({ currentModal }) => currentModal); - const setSelected = useModalStore(({ setCurrentModal }) => setCurrentModal); - - if (!selected) return null; - - const handleClose = () => setSelected(''); - - switch (selected) { - case ENTITY_TYPES.INSTRUMENTATION_RULE: - return ; - - case ENTITY_TYPES.SOURCE: - return ; - - case ENTITY_TYPES.ACTION: - return ; - - case ENTITY_TYPES.DESTINATION: - return ; - - default: - return <>; - } -}; - -export default AllModals; diff --git a/frontend/webapp/components/overview/index.ts b/frontend/webapp/components/overview/index.ts deleted file mode 100644 index be74a786e3..0000000000 --- a/frontend/webapp/components/overview/index.ts +++ /dev/null @@ -1,5 +0,0 @@ -export * from './add-entity'; -import AllDrawers from './all-drawers'; -import AllModals from './all-modals'; - -export { AllDrawers, AllModals }; diff --git a/frontend/webapp/lib/gql/apollo-wrapper.tsx b/frontend/webapp/components/providers/apollo-provider.tsx similarity index 86% rename from frontend/webapp/lib/gql/apollo-wrapper.tsx rename to frontend/webapp/components/providers/apollo-provider.tsx index 59ec838b47..57336dab1d 100644 --- a/frontend/webapp/lib/gql/apollo-wrapper.tsx +++ b/frontend/webapp/components/providers/apollo-provider.tsx @@ -1,11 +1,12 @@ 'use client'; +import { type FC, type PropsWithChildren } from 'react'; import { API } from '@/utils'; import { onError } from '@apollo/client/link/error'; import { ApolloLink, HttpLink } from '@apollo/client'; import { ApolloNextAppProvider, InMemoryCache, ApolloClient, SSRMultipartLink } from '@apollo/experimental-nextjs-app-support'; -function makeClient() { +const makeClient = () => { const httpLink = new HttpLink({ uri: API.GRAPHQL, }); @@ -33,8 +34,10 @@ function makeClient() { ]) : ApolloLink.from([errorLink, httpLink]), }); -} +}; -export function ApolloWrapper({ children }: React.PropsWithChildren<{}>) { +const ApolloProvider: FC = ({ children }) => { return {children}; -} +}; + +export default ApolloProvider; diff --git a/frontend/webapp/components/providers/error-boundary.tsx b/frontend/webapp/components/providers/error-boundary.tsx new file mode 100644 index 0000000000..7cc3ed0d28 --- /dev/null +++ b/frontend/webapp/components/providers/error-boundary.tsx @@ -0,0 +1,88 @@ +'use client'; + +import React, { type PropsWithChildren } from 'react'; +import Theme from '@odigos/ui-theme'; +import { Button } from '@odigos/ui-components'; +import { ErrorBoundary as ReactErrorBoundary } from 'react-error-boundary'; + +const ErrorFallback = ({ error }: { error: Error }) => { + const theme = Theme.useTheme(); + + return ( +
+

Something went wrong!

+ + 
+        {error.message}
+
+ +
+ Stack Trace + 
+          {error.stack}
+
+
+ +

+ Try refreshing the page or contact support +

+ +
+ ); +}; + +const ErrorBoundary = ({ children }: PropsWithChildren) => { + return ( + ( + + + + )} + > + {children} + + ); +}; + +export default ErrorBoundary; diff --git a/frontend/webapp/styles/theme-provider.tsx b/frontend/webapp/components/providers/theme-provider.tsx similarity index 83% rename from frontend/webapp/styles/theme-provider.tsx rename to frontend/webapp/components/providers/theme-provider.tsx index f097f99939..f631c9525a 100644 --- a/frontend/webapp/styles/theme-provider.tsx +++ b/frontend/webapp/components/providers/theme-provider.tsx @@ -1,5 +1,7 @@ +'use client'; + import React, { type FC, type PropsWithChildren, useState } from 'react'; -import { Theme } from '@odigos/ui-theme'; +import Theme from '@odigos/ui-theme'; import { useServerInsertedHTML } from 'next/navigation'; import { ServerStyleSheet, StyleSheetManager } from 'styled-components'; @@ -19,10 +21,12 @@ const StyledComponentsRegistry: FC = ({ children }) => { return {children}; }; -export const ThemeProvider: FC> = ({ children, darkMode }) => { +const ThemeProvider: FC = ({ children }) => { return ( - + {children} ); }; + +export default ThemeProvider; diff --git a/frontend/webapp/components/setup/header/index.tsx b/frontend/webapp/components/setup/header/index.tsx deleted file mode 100644 index b67e78158a..0000000000 --- a/frontend/webapp/components/setup/header/index.tsx +++ /dev/null @@ -1,41 +0,0 @@ -import React from 'react'; -import styled from 'styled-components'; -import { Theme } from '@odigos/ui-theme'; -import { useDarkModeStore } from '@/store'; -import { OdigosLogoText } from '@odigos/ui-icons'; -import { FlexRow, NavigationButtons, type NavigationButtonsProps, Text, ToggleDarkMode } from '@odigos/ui-components'; - -interface Props extends NavigationButtonsProps {} - -const Container = styled.div` - display: flex; - justify-content: space-between; - align-items: center; - height: 80px; - padding: 0 24px 0 32px; - background-color: ${({ theme }) => theme.colors.dark_grey}; - border-bottom: 1px solid ${({ theme }) => theme.colors.border + Theme.hexPercent['050']}; -`; - -const Title = styled(Text)` - position: absolute; - left: 50%; - transform: translateX(-50%); -`; - -export const SetupHeader: React.FC = ({ buttons }) => { - const { darkMode, setDarkMode } = useDarkModeStore(); - - return ( - - - - START WITH ODIGOS - - - - - - - ); -}; diff --git a/frontend/webapp/components/setup/index.tsx b/frontend/webapp/components/setup/index.tsx deleted file mode 100644 index 349c6cc4ba..0000000000 --- a/frontend/webapp/components/setup/index.tsx +++ /dev/null @@ -1,2 +0,0 @@ -export * from './menu'; -export * from './header'; diff --git a/frontend/webapp/components/setup/menu/index.tsx b/frontend/webapp/components/setup/menu/index.tsx deleted file mode 100644 index d127f33b4a..0000000000 --- a/frontend/webapp/components/setup/menu/index.tsx +++ /dev/null @@ -1,133 +0,0 @@ -import React, { useEffect } from 'react'; -import { type StepProps } from '@/types'; -import { Text } from '@odigos/ui-components'; -import { CheckIcon } from '@odigos/ui-icons'; -import styled, { css } from 'styled-components'; - -const Container = styled.div` - display: flex; - flex-direction: column; - gap: 32px; -`; - -const Step = styled.div<{ $state: 'finish' | 'active' | 'disabled' }>` - display: flex; - gap: 16px; - padding: 8px; - opacity: ${({ $state }) => ($state === 'disabled' ? 0.5 : 1)}; - transition: all 0.3s; - - ${({ $state }) => - $state === 'finish' && - css` - opacity: 0.8; - `} - - ${({ $state }) => $state === 'active' && css``} - - ${({ $state }) => - $state === 'disabled' && - css` - opacity: 0.5; - `} - - & + & { - margin-top: 10px; - } -`; - -const IconWrapper = styled.div<{ $state: 'finish' | 'active' | 'disabled' }>` - border-radius: 32px; - width: 24px; - height: 24px; - border: 1px solid ${({ theme }) => theme.colors.secondary}; - display: flex; - justify-content: center; - align-items: center; - - ${({ $state }) => - $state === 'finish' - ? css` - opacity: 0.8; - ` - : $state === 'disabled' && - css` - border: 1px dashed ${({ theme }) => theme.text.dark_grey}; - `} -`; - -const StepContent = styled.div` - display: flex; - justify-content: center; - flex-direction: column; - gap: 8px; -`; - -const StepTitle = styled(Text)` - font-weight: 500; -`; - -const StepSubtitle = styled(Text)``; - -export const SideMenu: React.FC<{ data?: StepProps[]; currentStep?: number }> = ({ data, currentStep }) => { - const [stepsList, setStepsList] = React.useState([]); - const steps: StepProps[] = data || [ - { - title: 'INSTALLATION', - subtitle: 'Success', - state: 'finish', - stepNumber: 1, - }, - { - title: 'SOURCES', - state: 'active', - subtitle: '', - - stepNumber: 2, - }, - { - title: 'DESTINATIONS', - state: 'disabled', - stepNumber: 3, - }, - ]; - - useEffect(() => { - if (currentStep) { - const currentSteps = (data || steps).map((step, index) => { - if (index < currentStep - 1) { - return { ...step, state: 'finish' as const }; - } else if (index === currentStep - 1) { - return { ...step, state: 'active' as const }; - } else { - return { ...step, state: 'disabled' as const }; - } - }); - - setStepsList(currentSteps); - } - }, [currentStep, data]); - - return ( - - {stepsList.map((step, index) => ( - - - {step.state === 'finish' && } - {step.state === 'active' && {step.stepNumber}} - {step.state === 'disabled' && {step.stepNumber}} - - - - {step.title} - {step.subtitle && ( - - {step.subtitle} - - )} - - - ))} - - ); -}; diff --git a/frontend/webapp/components/styled.tsx b/frontend/webapp/components/styled.tsx new file mode 100644 index 0000000000..1eb0cbfebc --- /dev/null +++ b/frontend/webapp/components/styled.tsx @@ -0,0 +1,25 @@ +import styled from 'styled-components'; +import { FlexColumn } from '@odigos/ui-components'; + +export const LayoutContainer = styled(FlexColumn)` + width: 100%; + height: 100vh; + background-color: ${({ theme }) => theme.colors.primary}; + align-items: center; +`; + +export const MainContent = styled.div` + width: 100%; + height: calc(100vh - 176px); + position: relative; +`; + +export const OnboardingStepperWrapper = styled.div` + position: absolute; + left: 24px; + top: 144px; + + @media (max-width: 1050px) { + display: none; + } +`; diff --git a/frontend/webapp/containers/index.ts b/frontend/webapp/containers/index.ts deleted file mode 100644 index aad1ca831e..0000000000 --- a/frontend/webapp/containers/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './main'; diff --git a/frontend/webapp/containers/main/actions/action-drawer/build-card.ts b/frontend/webapp/containers/main/actions/action-drawer/build-card.ts deleted file mode 100644 index e0de8617b7..0000000000 --- a/frontend/webapp/containers/main/actions/action-drawer/build-card.ts +++ /dev/null @@ -1,97 +0,0 @@ -import { DISPLAY_TITLES } from '@/utils'; -import type { ActionDataParsed } from '@/types'; -import { DATA_CARD_FIELD_TYPES, DataCardFieldsProps } from '@odigos/ui-components'; - -const buildCard = (action: ActionDataParsed) => { - const { - type, - spec: { - actionName, - notes, - signals, - disabled, - - clusterAttributes, - attributeNamesToDelete, - renames, - piiCategories, - fallback_sampling_ratio, - sampling_percentage, - endpoints_filters, - }, - } = action; - - const arr: DataCardFieldsProps['data'] = [ - { title: DISPLAY_TITLES.TYPE, value: type }, - { type: DATA_CARD_FIELD_TYPES.ACTIVE_STATUS, title: DISPLAY_TITLES.STATUS, value: String(!disabled) }, - { title: DISPLAY_TITLES.NAME, value: actionName }, - { title: DISPLAY_TITLES.NOTES, value: notes }, - { type: DATA_CARD_FIELD_TYPES.DIVIDER, width: '100%' }, - { type: DATA_CARD_FIELD_TYPES.MONITORS, title: DISPLAY_TITLES.SIGNALS_FOR_PROCESSING, value: signals.map((str) => str.toLowerCase()).join(', ') }, - ]; - - if (clusterAttributes) { - let str = ''; - clusterAttributes.forEach(({ attributeName, attributeStringValue }, idx) => { - str += `${attributeName}: ${attributeStringValue}`; - if (idx < clusterAttributes.length - 1) str += ', '; - }); - - arr.push({ title: 'Attributes', value: str }); - } - - if (attributeNamesToDelete) { - let str = ''; - attributeNamesToDelete.forEach((attributeName, idx) => { - str += attributeName; - if (idx < attributeNamesToDelete.length - 1) str += ', '; - }); - - arr.push({ title: 'Attributes', value: str }); - } - - if (renames) { - let str = ''; - const entries = Object.entries(renames); - entries.forEach(([oldName, newName], idx) => { - str += `${oldName}: ${newName}`; - if (idx < entries.length - 1) str += ', '; - }); - - arr.push({ title: 'Attributes', value: str }); - } - - if (piiCategories) { - let str = ''; - piiCategories.forEach((attributeName, idx) => { - str += attributeName; - if (idx < piiCategories.length - 1) str += ', '; - }); - - arr.push({ title: 'Attributes', value: str }); - } - - if (fallback_sampling_ratio) { - arr.push({ title: 'Sampling Ratio', value: String(fallback_sampling_ratio) }); - } - - if (sampling_percentage) { - arr.push({ title: 'Sampling Percentage', value: sampling_percentage }); - } - - if (endpoints_filters) { - endpoints_filters.forEach(({ service_name, http_route, minimum_latency_threshold, fallback_sampling_ratio }, idx) => { - let str = ''; - str += `Service Name: ${service_name}\n`; - str += `HTTP Route: ${http_route}\n`; - str += `Min. Latency: ${minimum_latency_threshold}\n`; - str += `Sampling Ratio: ${fallback_sampling_ratio}`; - - arr.push({ title: `Endpoint${endpoints_filters.length > 1 ? ` #${idx + 1}` : ''}`, value: str }); - }); - } - - return arr; -}; - -export default buildCard; diff --git a/frontend/webapp/containers/main/actions/action-drawer/build-drawer-item.ts b/frontend/webapp/containers/main/actions/action-drawer/build-drawer-item.ts deleted file mode 100644 index b5ae22b377..0000000000 --- a/frontend/webapp/containers/main/actions/action-drawer/build-drawer-item.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { safeJsonParse } from '@odigos/ui-utils'; -import type { ActionDataParsed, ActionInput } from '@/types'; - -const buildDrawerItem = (id: string, formData: ActionInput, drawerItem: ActionDataParsed): ActionDataParsed => { - const { type, name, notes, signals, disable, details } = formData; - const { conditions } = drawerItem; - - return { - id, - type, - spec: { - actionName: name, - notes: notes, - signals: signals, - disabled: disable, - ...safeJsonParse(details, {}), - }, - conditions, - }; -}; - -export default buildDrawerItem; diff --git a/frontend/webapp/containers/main/actions/action-drawer/index.tsx b/frontend/webapp/containers/main/actions/action-drawer/index.tsx deleted file mode 100644 index 6b20379b2c..0000000000 --- a/frontend/webapp/containers/main/actions/action-drawer/index.tsx +++ /dev/null @@ -1,160 +0,0 @@ -import React, { useEffect, useMemo, useState } from 'react'; -import buildCard from './build-card'; -import { ActionFormBody } from '../'; -import styled from 'styled-components'; -import { useDrawerStore } from '@/store'; -import { type ActionDataParsed } from '@/types'; -import buildDrawerItem from './build-drawer-item'; -import { useActionCRUD, useActionFormData } from '@/hooks'; -import OverviewDrawer from '../../overview/overview-drawer'; -import { ACTION, CONDITION_STATUS, DATA_CARDS } from '@/utils'; -import { ConditionDetails, type ConditionDetailsProps, DataCard } from '@odigos/ui-components'; -import { ACTION_OPTIONS, ENTITY_TYPES, getActionIcon, NOTIFICATION_TYPE } from '@odigos/ui-utils'; - -interface Props {} - -const FormContainer = styled.div` - width: 100%; - height: 100%; - max-height: calc(100vh - 220px); - overflow: overlay; - overflow-y: auto; -`; - -const DataContainer = styled.div` - display: flex; - flex-direction: column; - gap: 12px; -`; - -export const ActionDrawer: React.FC = () => { - const { selectedItem, setSelectedItem } = useDrawerStore(); - const { formData, formErrors, handleFormChange, resetFormData, validateForm, loadFormWithDrawerItem } = useActionFormData(); - const { actions, updateAction, deleteAction } = useActionCRUD({ - onSuccess: (type) => { - setIsEditing(false); - setIsFormDirty(false); - - if (type === ACTION.DELETE) setSelectedItem(null); - else reSelectItem(); - }, - }); - - const reSelectItem = (fetchedItems?: typeof actions) => { - const { item } = selectedItem as { item: ActionDataParsed }; - const { id } = item; - - if (!!fetchedItems?.length) { - const found = fetchedItems.find((x) => x.id === id); - if (!!found) { - return setSelectedItem({ id, type: ENTITY_TYPES.ACTION, item: found }); - } - } - - setSelectedItem({ id, type: ENTITY_TYPES.ACTION, item: buildDrawerItem(id, formData, item) }); - }; - - // This should keep the drawer up-to-date with the latest data - useEffect(() => reSelectItem(actions), [actions]); - - const [isEditing, setIsEditing] = useState(false); - const [isFormDirty, setIsFormDirty] = useState(false); - - const cardData = useMemo(() => { - if (!selectedItem) return []; - - const { item } = selectedItem as { item: ActionDataParsed }; - const arr = buildCard(item); - - return arr; - }, [selectedItem]); - - const conditionsData: ConditionDetailsProps = useMemo(() => { - if (!selectedItem) return { conditions: [] }; - - const { item } = selectedItem as { item: ActionDataParsed }; - - return { - conditions: - item?.conditions?.map(({ status, message, lastTransitionTime }) => ({ - status: status === CONDITION_STATUS.FALSE ? NOTIFICATION_TYPE.ERROR : status === CONDITION_STATUS.TRUE ? NOTIFICATION_TYPE.SUCCESS : NOTIFICATION_TYPE.WARNING, - message, - lastTransitionTime, - })) || [], - }; - }, [selectedItem]); - - const thisAction = useMemo(() => { - if (!selectedItem || !isEditing) { - resetFormData(); - return undefined; - } - - const { item } = selectedItem as { item: ActionDataParsed }; - const found = - ACTION_OPTIONS.find(({ type }) => type === item.type) || - ACTION_OPTIONS.find(({ id }) => id === 'attributes')?.items?.find(({ type }) => type === item.type) || - ACTION_OPTIONS.find(({ id }) => id === 'sampler')?.items?.find(({ type }) => type === item.type); - - loadFormWithDrawerItem(selectedItem); - - return found; - }, [selectedItem, isEditing]); - - if (!selectedItem?.item) return null; - const { id, item } = selectedItem as { id: string; item: ActionDataParsed }; - - const handleEdit = (bool?: boolean) => { - setIsEditing(typeof bool === 'boolean' ? bool : true); - }; - - const handleCancel = () => { - setIsEditing(false); - setIsFormDirty(false); - }; - - const handleDelete = async () => { - await deleteAction(id, item.type); - }; - - const handleSave = async (newTitle: string) => { - if (validateForm({ withAlert: true, alertTitle: ACTION.UPDATE })) { - const title = newTitle !== item.type ? newTitle : ''; - handleFormChange('name', title); - await updateAction(id, { ...formData, name: title }); - } - }; - - return ( - - {isEditing && thisAction ? ( - - { - setIsFormDirty(true); - handleFormChange(...params); - }} - /> - - ) : ( - - - - - )} - - ); -}; diff --git a/frontend/webapp/containers/main/actions/action-form-body/custom-fields/add-cluster-info.tsx b/frontend/webapp/containers/main/actions/action-form-body/custom-fields/add-cluster-info.tsx deleted file mode 100644 index 10d661d067..0000000000 --- a/frontend/webapp/containers/main/actions/action-form-body/custom-fields/add-cluster-info.tsx +++ /dev/null @@ -1,40 +0,0 @@ -import React, { useMemo } from 'react'; -import { safeJsonParse } from '@odigos/ui-utils'; -import type { AddClusterInfoSpec } from '@/types'; -import { KeyValueInputsList } from '@odigos/ui-components'; - -type Props = { - value: string; - setValue: (value: string) => void; - errorMessage?: string; -}; - -type Parsed = AddClusterInfoSpec; - -const AddClusterInfo: React.FC = ({ value, setValue, errorMessage }) => { - const mappedValue = useMemo( - () => - safeJsonParse(value, { clusterAttributes: [] }).clusterAttributes.map((obj) => ({ - key: obj.attributeName, - value: obj.attributeStringValue, - })), - [value], - ); - - const handleChange = (arr: { key: string; value: string }[]) => { - const payload: Parsed = { - clusterAttributes: arr.map((obj) => ({ - attributeName: obj.key, - attributeStringValue: obj.value, - })), - }; - - const str = !!payload.clusterAttributes.length ? JSON.stringify(payload) : ''; - - setValue(str); - }; - - return ; -}; - -export default AddClusterInfo; diff --git a/frontend/webapp/containers/main/actions/action-form-body/custom-fields/delete-attributes.tsx b/frontend/webapp/containers/main/actions/action-form-body/custom-fields/delete-attributes.tsx deleted file mode 100644 index 93796ae91f..0000000000 --- a/frontend/webapp/containers/main/actions/action-form-body/custom-fields/delete-attributes.tsx +++ /dev/null @@ -1,30 +0,0 @@ -import React, { useMemo } from 'react'; -import { safeJsonParse } from '@odigos/ui-utils'; -import { InputList } from '@odigos/ui-components'; -import type { DeleteAttributesSpec } from '@/types'; - -type Props = { - value: string; - setValue: (value: string) => void; - errorMessage?: string; -}; - -type Parsed = DeleteAttributesSpec; - -const DeleteAttributes: React.FC = ({ value, setValue, errorMessage }) => { - const mappedValue = useMemo(() => safeJsonParse(value, { attributeNamesToDelete: [] }).attributeNamesToDelete, [value]); - - const handleChange = (arr: string[]) => { - const payload: Parsed = { - attributeNamesToDelete: arr, - }; - - const str = !!payload.attributeNamesToDelete.length ? JSON.stringify(payload) : ''; - - setValue(str); - }; - - return ; -}; - -export default DeleteAttributes; diff --git a/frontend/webapp/containers/main/actions/action-form-body/custom-fields/error-sampler.tsx b/frontend/webapp/containers/main/actions/action-form-body/custom-fields/error-sampler.tsx deleted file mode 100644 index 12607fb14d..0000000000 --- a/frontend/webapp/containers/main/actions/action-form-body/custom-fields/error-sampler.tsx +++ /dev/null @@ -1,39 +0,0 @@ -import React, { useEffect, useMemo } from 'react'; -import { Input } from '@odigos/ui-components'; -import type { ErrorSamplerSpec } from '@/types'; -import { isEmpty, safeJsonParse } from '@odigos/ui-utils'; - -type Props = { - value: string; - setValue: (value: string) => void; - errorMessage?: string; -}; - -type Parsed = ErrorSamplerSpec; - -const MIN = 0, - MAX = 100; - -const ErrorSampler: React.FC = ({ value, setValue, errorMessage }) => { - const mappedValue = useMemo(() => safeJsonParse(value, { fallback_sampling_ratio: 0 }).fallback_sampling_ratio, [value]); - - const handleChange = (val: string) => { - const num = Math.max(MIN, Math.min(Number(val), MAX)) || MIN; - - const payload: Parsed = { - fallback_sampling_ratio: num, - }; - - const str = isEmpty(payload.fallback_sampling_ratio) ? '' : JSON.stringify(payload); - - setValue(str); - }; - - useEffect(() => { - if (isEmpty(safeJsonParse(value, {}))) handleChange('0'); - }, [value]); - - return handleChange(v)} errorMessage={errorMessage} />; -}; - -export default ErrorSampler; diff --git a/frontend/webapp/containers/main/actions/action-form-body/custom-fields/index.tsx b/frontend/webapp/containers/main/actions/action-form-body/custom-fields/index.tsx deleted file mode 100644 index 697942c26e..0000000000 --- a/frontend/webapp/containers/main/actions/action-form-body/custom-fields/index.tsx +++ /dev/null @@ -1,44 +0,0 @@ -import React from 'react'; -import PiiMasking from './pii-masking'; -import ErrorSampler from './error-sampler'; -import LatencySampler from './latency-sampler'; -import { ACTION_TYPE } from '@odigos/ui-utils'; -import AddClusterInfo from './add-cluster-info'; -import DeleteAttributes from './delete-attributes'; -import RenameAttributes from './rename-attributes'; -import ProbabilisticSampler from './probabilistic-sampler'; - -interface Props { - actionType?: ACTION_TYPE; - value: string; - setValue: (value: string) => void; - errorMessage?: string; -} - -interface ComponentProps { - value: Props['value']; - setValue: Props['setValue']; - errorMessage?: Props['errorMessage']; -} - -type ComponentType = React.FC | null; - -const componentsMap: Record = { - [ACTION_TYPE.ADD_CLUSTER_INFO]: AddClusterInfo, - [ACTION_TYPE.DELETE_ATTRIBUTES]: DeleteAttributes, - [ACTION_TYPE.RENAME_ATTRIBUTES]: RenameAttributes, - [ACTION_TYPE.PII_MASKING]: PiiMasking, - [ACTION_TYPE.ERROR_SAMPLER]: ErrorSampler, - [ACTION_TYPE.PROBABILISTIC_SAMPLER]: ProbabilisticSampler, - [ACTION_TYPE.LATENCY_SAMPLER]: LatencySampler, -}; - -const ActionCustomFields: React.FC = ({ actionType, value, setValue, errorMessage }) => { - if (!actionType) return null; - - const Component = componentsMap[actionType]; - - return Component ? : null; -}; - -export default ActionCustomFields; diff --git a/frontend/webapp/containers/main/actions/action-form-body/custom-fields/latency-sampler.tsx b/frontend/webapp/containers/main/actions/action-form-body/custom-fields/latency-sampler.tsx deleted file mode 100644 index b76b62ed41..0000000000 --- a/frontend/webapp/containers/main/actions/action-form-body/custom-fields/latency-sampler.tsx +++ /dev/null @@ -1,70 +0,0 @@ -import React, { useMemo } from 'react'; -import { safeJsonParse } from '@odigos/ui-utils'; -import type { LatencySamplerSpec } from '@/types'; -import { InputTable } from '@odigos/ui-components'; - -type Props = { - value: string; - setValue: (value: string) => void; - errorMessage?: string; -}; - -type Parsed = LatencySamplerSpec; - -const LatencySampler: React.FC = ({ value, setValue, errorMessage }) => { - const mappedValue = useMemo(() => safeJsonParse(value, { endpoints_filters: [] }).endpoints_filters, [value]); - - const handleChange = (arr: Parsed['endpoints_filters']) => { - const payload: Parsed = { - endpoints_filters: arr, - }; - - const str = !!payload.endpoints_filters.length ? JSON.stringify(payload) : ''; - - setValue(str); - }; - - return ( - - ); -}; - -export default LatencySampler; diff --git a/frontend/webapp/containers/main/actions/action-form-body/custom-fields/pii-masking.tsx b/frontend/webapp/containers/main/actions/action-form-body/custom-fields/pii-masking.tsx deleted file mode 100644 index 23939dd1ce..0000000000 --- a/frontend/webapp/containers/main/actions/action-form-body/custom-fields/pii-masking.tsx +++ /dev/null @@ -1,77 +0,0 @@ -import React, { useEffect, useMemo, useState } from 'react'; -import type { PiiMaskingSpec } from '@/types'; -import styled, { css } from 'styled-components'; -import { safeJsonParse } from '@odigos/ui-utils'; -import { Checkbox, FieldError, FieldLabel } from '@odigos/ui-components'; - -type Props = { - value: string; - setValue: (value: string) => void; - errorMessage?: string; -}; - -type Parsed = PiiMaskingSpec; - -const ListContainer = styled.div<{ $hasError: boolean }>` - display: flex; - flex-direction: row; - gap: 32px; - ${({ $hasError }) => - $hasError && - css` - border: 1px solid ${({ theme }) => theme.text.error}; - border-radius: 32px; - padding: 8px; - `} -`; - -const strictPicklist = [ - { - id: 'CREDIT_CARD', - label: 'Credit Card', - }, -]; - -const PiiMasking: React.FC = ({ value, setValue, errorMessage }) => { - const mappedValue = useMemo(() => safeJsonParse(value, { piiCategories: [] }).piiCategories, [value]); - const [isLastSelection, setIsLastSelection] = useState(mappedValue.length === 1); - - useEffect(() => { - if (!mappedValue.length) { - const payload: Parsed = { - piiCategories: strictPicklist.map(({ id }) => id), - }; - - setValue(JSON.stringify(payload)); - setIsLastSelection(payload.piiCategories.length === 1); - } - // eslint-disable-next-line - }, []); - - const handleChange = (id: string, isAdd: boolean) => { - const arr = isAdd ? [...mappedValue, id] : mappedValue.filter((str) => str !== id); - - const payload: Parsed = { - piiCategories: arr, - }; - - const str = !!arr.length ? JSON.stringify(payload) : ''; - - setValue(str); - setIsLastSelection(arr.length === 1); - }; - - return ( -
- - - {strictPicklist.map(({ id, label }) => ( - handleChange(id, bool)} /> - ))} - - {!!errorMessage && {errorMessage}} -
- ); -}; - -export default PiiMasking; diff --git a/frontend/webapp/containers/main/actions/action-form-body/custom-fields/probabilistic-sampler.tsx b/frontend/webapp/containers/main/actions/action-form-body/custom-fields/probabilistic-sampler.tsx deleted file mode 100644 index 72acb38acd..0000000000 --- a/frontend/webapp/containers/main/actions/action-form-body/custom-fields/probabilistic-sampler.tsx +++ /dev/null @@ -1,39 +0,0 @@ -import React, { useEffect, useMemo } from 'react'; -import { Input } from '@odigos/ui-components'; -import type { ProbabilisticSamplerSpec } from '@/types'; -import { isEmpty, safeJsonParse } from '@odigos/ui-utils'; - -type Props = { - value: string; - setValue: (value: string) => void; - errorMessage?: string; -}; - -type Parsed = ProbabilisticSamplerSpec; - -const MIN = 0, - MAX = 100; - -const ProbabilisticSampler: React.FC = ({ value, setValue, errorMessage }) => { - const mappedValue = useMemo(() => safeJsonParse(value, { sampling_percentage: '0' }).sampling_percentage, [value]); - - const handleChange = (val: string) => { - const num = Math.max(MIN, Math.min(Number(val), MAX)) || MIN; - - const payload: Parsed = { - sampling_percentage: String(num), - }; - - const str = isEmpty(payload.sampling_percentage) ? '' : JSON.stringify(payload); - - setValue(str); - }; - - useEffect(() => { - if (isEmpty(safeJsonParse(value, {}))) handleChange('0'); - }, [value]); - - return handleChange(v)} errorMessage={errorMessage} />; -}; - -export default ProbabilisticSampler; diff --git a/frontend/webapp/containers/main/actions/action-form-body/custom-fields/rename-attributes.tsx b/frontend/webapp/containers/main/actions/action-form-body/custom-fields/rename-attributes.tsx deleted file mode 100644 index b6b625297f..0000000000 --- a/frontend/webapp/containers/main/actions/action-form-body/custom-fields/rename-attributes.tsx +++ /dev/null @@ -1,39 +0,0 @@ -import React, { useMemo } from 'react'; -import { safeJsonParse } from '@odigos/ui-utils'; -import type { RenameAttributesSpec } from '@/types'; -import { KeyValueInputsList } from '@odigos/ui-components'; - -type Props = { - value: string; - setValue: (value: string) => void; - errorMessage?: string; -}; - -type Parsed = RenameAttributesSpec; - -const RenameAttributes: React.FC = ({ value, setValue, errorMessage }) => { - const mappedValue = useMemo(() => Object.entries(safeJsonParse(value, { renames: {} }).renames).map(([k, v]) => ({ key: k, value: v })), [value]); - - const handleChange = ( - arr: { - key: string; - value: string; - }[], - ) => { - const payload: Parsed = { - renames: {}, - }; - - arr.forEach((obj) => { - payload.renames[obj.key] = obj.value; - }); - - const str = !!arr.length ? JSON.stringify(payload) : ''; - - setValue(str); - }; - - return ; -}; - -export default RenameAttributes; diff --git a/frontend/webapp/containers/main/actions/action-form-body/index.tsx b/frontend/webapp/containers/main/actions/action-form-body/index.tsx deleted file mode 100644 index cc1b2d936c..0000000000 --- a/frontend/webapp/containers/main/actions/action-form-body/index.tsx +++ /dev/null @@ -1,74 +0,0 @@ -import React from 'react'; -import { Theme } from '@odigos/ui-theme'; -import { type ActionInput } from '@/types'; -import ActionCustomFields from './custom-fields'; -import styled, { useTheme } from 'styled-components'; -import { type ActionOption } from '@odigos/ui-utils'; -import { CheckCircledIcon, CrossCircledIcon } from '@odigos/ui-icons'; -import { DocsButton, Input, MonitorsCheckboxes, SectionTitle, Segment, Text, TextArea } from '@odigos/ui-components'; - -interface Props { - isUpdate?: boolean; - action: ActionOption; - formData: ActionInput; - formErrors: Record; - handleFormChange: (key: keyof ActionInput, val: any) => void; -} - -const Container = styled.div` - display: flex; - flex-direction: column; - gap: 24px; - padding: 4px; -`; - -const FieldTitle = styled(Text)` - margin-bottom: 12px; -`; - -export const ActionFormBody: React.FC = ({ isUpdate, action, formData, formErrors, handleFormChange }) => { - const theme = useTheme(); - - return ( - - {isUpdate && ( -
- Status - handleFormChange('disable', bool)} - /> -
- )} - - {!isUpdate && } />} - - handleFormChange('signals', value)} - errorMessage={formErrors['signals']} - /> - - {!isUpdate && ( - handleFormChange('name', value)} - errorMessage={formErrors['name']} - /> - )} - - handleFormChange('details', val)} errorMessage={formErrors['details']} /> - -