From 72b78847600d5360c9dcdb4e85f79a0dec8e2bb3 Mon Sep 17 00:00:00 2001 From: Oleg Bespalov Date: Wed, 19 Feb 2025 13:37:14 +0100 Subject: [PATCH] output opentelemetry: move to using the in k6 code --- go.mod | 11 +- go.sum | 2 - internal/cmd/outputs.go | 2 +- .../{pkg/opentelemetry => }/attribute.go | 0 .../{pkg/opentelemetry => }/config.go | 0 .../{pkg/opentelemetry => }/config_test.go | 0 .../{pkg/opentelemetry => }/exporter.go | 0 .../{pkg/opentelemetry => }/output.go | 0 .../{pkg/opentelemetry => }/output_test.go | 2 +- .../{pkg/opentelemetry => }/registry.go | 0 .../{pkg/opentelemetry => }/tls.go | 0 .../grafana/xk6-output-opentelemetry/LICENSE | 661 ------------------ .../pkg/opentelemetry/attribute.go | 27 - .../pkg/opentelemetry/config.go | 279 -------- .../pkg/opentelemetry/exporter.go | 127 ---- .../pkg/opentelemetry/output.go | 205 ------ .../pkg/opentelemetry/registry.go | 151 ---- .../pkg/opentelemetry/tls.go | 57 -- vendor/modules.txt | 3 - 19 files changed, 7 insertions(+), 1520 deletions(-) rename internal/output/opentelemetry/{pkg/opentelemetry => }/attribute.go (100%) rename internal/output/opentelemetry/{pkg/opentelemetry => }/config.go (100%) rename internal/output/opentelemetry/{pkg/opentelemetry => }/config_test.go (100%) rename internal/output/opentelemetry/{pkg/opentelemetry => }/exporter.go (100%) rename internal/output/opentelemetry/{pkg/opentelemetry => }/output.go (100%) rename internal/output/opentelemetry/{pkg/opentelemetry => }/output_test.go (99%) rename internal/output/opentelemetry/{pkg/opentelemetry => }/registry.go (100%) rename internal/output/opentelemetry/{pkg/opentelemetry => }/tls.go (100%) delete mode 100644 vendor/github.com/grafana/xk6-output-opentelemetry/LICENSE delete mode 100644 vendor/github.com/grafana/xk6-output-opentelemetry/pkg/opentelemetry/attribute.go delete mode 100644 vendor/github.com/grafana/xk6-output-opentelemetry/pkg/opentelemetry/config.go delete mode 100644 vendor/github.com/grafana/xk6-output-opentelemetry/pkg/opentelemetry/exporter.go delete mode 100644 vendor/github.com/grafana/xk6-output-opentelemetry/pkg/opentelemetry/output.go delete mode 100644 vendor/github.com/grafana/xk6-output-opentelemetry/pkg/opentelemetry/registry.go delete mode 100644 vendor/github.com/grafana/xk6-output-opentelemetry/pkg/opentelemetry/tls.go diff --git a/go.mod b/go.mod index e648f2e92a3..70dff2df32b 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,6 @@ require ( github.com/gorilla/websocket v1.5.3 github.com/grafana/sobek v0.0.0-20241024150027-d91f02b05e9b github.com/grafana/xk6-dashboard v0.7.5 - github.com/grafana/xk6-output-opentelemetry v0.3.0 github.com/grafana/xk6-redis v0.3.3 github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 github.com/influxdata/influxdb1-client v0.0.0-20190402204710-8ff2fc3824fc @@ -41,11 +40,16 @@ require ( github.com/stretchr/testify v1.10.0 github.com/tidwall/gjson v1.18.0 go.opentelemetry.io/otel v1.32.0 + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0 + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.29.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.29.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.29.0 + go.opentelemetry.io/otel/metric v1.32.0 go.opentelemetry.io/otel/sdk v1.32.0 + go.opentelemetry.io/otel/sdk/metric v1.32.0 go.opentelemetry.io/otel/trace v1.32.0 + go.opentelemetry.io/proto/otlp v1.3.1 go.uber.org/goleak v1.3.0 golang.org/x/crypto v0.33.0 golang.org/x/crypto/x509roots/fallback v0.0.0-20250210163342-e47973b1c108 @@ -88,11 +92,6 @@ require ( github.com/redis/go-redis/v9 v9.0.5 // indirect github.com/tidwall/match v1.1.1 // indirect github.com/tidwall/pretty v1.2.1 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0 // indirect - go.opentelemetry.io/otel/metric v1.32.0 // indirect - go.opentelemetry.io/otel/sdk/metric v1.32.0 // indirect - go.opentelemetry.io/proto/otlp v1.3.1 // indirect golang.org/x/sys v0.30.0 // indirect golang.org/x/text v0.22.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20241202173237-19429a94021a // indirect diff --git a/go.sum b/go.sum index a5ed3f34d25..3e5ea79cce9 100644 --- a/go.sum +++ b/go.sum @@ -85,8 +85,6 @@ github.com/grafana/sobek v0.0.0-20241024150027-d91f02b05e9b h1:hzfIt1lf19Zx1jIYd github.com/grafana/sobek v0.0.0-20241024150027-d91f02b05e9b/go.mod h1:FmcutBFPLiGgroH42I4/HBahv7GxVjODcVWFTw1ISes= github.com/grafana/xk6-dashboard v0.7.5 h1:TcILyffT/Ea/XD7xG1jMA5lwtusOPRbEQsQDHmO30Mk= github.com/grafana/xk6-dashboard v0.7.5/go.mod h1:Y75F8xmgCraKT+pBzFH6me9AyH5PkXD+Bxo1dm6Il/M= -github.com/grafana/xk6-output-opentelemetry v0.3.0 h1:dmclGBFtFVRJijqLncpu2dKVIIvx1GS3y6sQGg4Khl8= -github.com/grafana/xk6-output-opentelemetry v0.3.0/go.mod h1:5uUg0J2dxrw+DkC9fCsfiKv2jTpccn7nz6vGmRUr4f8= github.com/grafana/xk6-redis v0.3.3 h1:9QiS4OUjYMzvriGzbqrhCn9i/kENmCkibZE+xCJSdPk= github.com/grafana/xk6-redis v0.3.3/go.mod h1:YL1qfBZXW4o2aAF6/gRa/N9oGoumUg7cJzzCHLxoCOw= github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 h1:UH//fgunKIs4JdUbpDl1VZCDaL56wXCB/5+wF6uHfaI= diff --git a/internal/cmd/outputs.go b/internal/cmd/outputs.go index e9a757788f8..7051cae4814 100644 --- a/internal/cmd/outputs.go +++ b/internal/cmd/outputs.go @@ -11,13 +11,13 @@ import ( "go.k6.io/k6/internal/output/cloud" "go.k6.io/k6/internal/output/influxdb" "go.k6.io/k6/internal/output/json" + "go.k6.io/k6/internal/output/opentelemetry" "go.k6.io/k6/internal/output/prometheusrw/remotewrite" "go.k6.io/k6/lib" "go.k6.io/k6/output" "go.k6.io/k6/output/csv" "github.com/grafana/xk6-dashboard/dashboard" - "github.com/grafana/xk6-output-opentelemetry/pkg/opentelemetry" ) // builtinOutput marks the available builtin outputs. diff --git a/internal/output/opentelemetry/pkg/opentelemetry/attribute.go b/internal/output/opentelemetry/attribute.go similarity index 100% rename from internal/output/opentelemetry/pkg/opentelemetry/attribute.go rename to internal/output/opentelemetry/attribute.go diff --git a/internal/output/opentelemetry/pkg/opentelemetry/config.go b/internal/output/opentelemetry/config.go similarity index 100% rename from internal/output/opentelemetry/pkg/opentelemetry/config.go rename to internal/output/opentelemetry/config.go diff --git a/internal/output/opentelemetry/pkg/opentelemetry/config_test.go b/internal/output/opentelemetry/config_test.go similarity index 100% rename from internal/output/opentelemetry/pkg/opentelemetry/config_test.go rename to internal/output/opentelemetry/config_test.go diff --git a/internal/output/opentelemetry/pkg/opentelemetry/exporter.go b/internal/output/opentelemetry/exporter.go similarity index 100% rename from internal/output/opentelemetry/pkg/opentelemetry/exporter.go rename to internal/output/opentelemetry/exporter.go diff --git a/internal/output/opentelemetry/pkg/opentelemetry/output.go b/internal/output/opentelemetry/output.go similarity index 100% rename from internal/output/opentelemetry/pkg/opentelemetry/output.go rename to internal/output/opentelemetry/output.go diff --git a/internal/output/opentelemetry/pkg/opentelemetry/output_test.go b/internal/output/opentelemetry/output_test.go similarity index 99% rename from internal/output/opentelemetry/pkg/opentelemetry/output_test.go rename to internal/output/opentelemetry/output_test.go index ccc59c6bb1e..0b00c8a1bf8 100644 --- a/internal/output/opentelemetry/pkg/opentelemetry/output_test.go +++ b/internal/output/opentelemetry/output_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.k6.io/k6/lib/testutils" + "go.k6.io/k6/internal/lib/testutils" "go.k6.io/k6/metrics" "go.k6.io/k6/output" collectormetrics "go.opentelemetry.io/proto/otlp/collector/metrics/v1" diff --git a/internal/output/opentelemetry/pkg/opentelemetry/registry.go b/internal/output/opentelemetry/registry.go similarity index 100% rename from internal/output/opentelemetry/pkg/opentelemetry/registry.go rename to internal/output/opentelemetry/registry.go diff --git a/internal/output/opentelemetry/pkg/opentelemetry/tls.go b/internal/output/opentelemetry/tls.go similarity index 100% rename from internal/output/opentelemetry/pkg/opentelemetry/tls.go rename to internal/output/opentelemetry/tls.go diff --git a/vendor/github.com/grafana/xk6-output-opentelemetry/LICENSE b/vendor/github.com/grafana/xk6-output-opentelemetry/LICENSE deleted file mode 100644 index 0ad25db4bd1..00000000000 --- a/vendor/github.com/grafana/xk6-output-opentelemetry/LICENSE +++ /dev/null @@ -1,661 +0,0 @@ - GNU AFFERO GENERAL PUBLIC LICENSE - Version 3, 19 November 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU Affero General Public License is a free, copyleft license for -software and other kinds of works, specifically designed to ensure -cooperation with the community in the case of network server software. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -our General Public Licenses are intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - Developers that use our General Public Licenses protect your rights -with two steps: (1) assert copyright on the software, and (2) offer -you this License which gives you legal permission to copy, distribute -and/or modify the software. - - A secondary benefit of defending all users' freedom is that -improvements made in alternate versions of the program, if they -receive widespread use, become available for other developers to -incorporate. Many developers of free software are heartened and -encouraged by the resulting cooperation. However, in the case of -software used on network servers, this result may fail to come about. -The GNU General Public License permits making a modified version and -letting the public access it on a server without ever releasing its -source code to the public. - - The GNU Affero General Public License is designed specifically to -ensure that, in such cases, the modified source code becomes available -to the community. It requires the operator of a network server to -provide the source code of the modified version running there to the -users of that server. Therefore, public use of a modified version, on -a publicly accessible server, gives the public access to the source -code of the modified version. - - An older license, called the Affero General Public License and -published by Affero, was designed to accomplish similar goals. This is -a different license, not a version of the Affero GPL, but Affero has -released a new version of the Affero GPL which permits relicensing under -this license. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU Affero General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Remote Network Interaction; Use with the GNU General Public License. - - Notwithstanding any other provision of this License, if you modify the -Program, your modified version must prominently offer all users -interacting with it remotely through a computer network (if your version -supports such interaction) an opportunity to receive the Corresponding -Source of your version by providing access to the Corresponding Source -from a network server at no charge, through some standard or customary -means of facilitating copying of software. This Corresponding Source -shall include the Corresponding Source for any work covered by version 3 -of the GNU General Public License that is incorporated pursuant to the -following paragraph. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the work with which it is combined will remain governed by version -3 of the GNU General Public License. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU Affero General Public License from time to time. Such new versions -will be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU Affero General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU Affero General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU Affero General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published - by the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If your software can interact with users remotely through a computer -network, you should also make sure that it provides a way for users to -get its source. For example, if your program is a web application, its -interface could display a "Source" link that leads users to an archive -of the code. There are many ways you could offer source, and different -solutions will be better for different programs; see section 13 for the -specific requirements. - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU AGPL, see -. diff --git a/vendor/github.com/grafana/xk6-output-opentelemetry/pkg/opentelemetry/attribute.go b/vendor/github.com/grafana/xk6-output-opentelemetry/pkg/opentelemetry/attribute.go deleted file mode 100644 index ad4194ca145..00000000000 --- a/vendor/github.com/grafana/xk6-output-opentelemetry/pkg/opentelemetry/attribute.go +++ /dev/null @@ -1,27 +0,0 @@ -package opentelemetry - -import ( - "github.com/mstoykov/atlas" - "go.k6.io/k6/metrics" - "go.opentelemetry.io/otel/attribute" -) - -// newAttributeSet converts a k6 tag set into -// the equivalent set of opentelemetry attributes -func newAttributeSet(t *metrics.TagSet) attribute.Set { - n := (*atlas.Node)(t) - if n.Len() < 1 { - return *attribute.EmptySet() - } - labels := make([]attribute.KeyValue, 0, n.Len()) - for !n.IsRoot() { - prev, key, value := n.Data() - n = prev - if key == "" || value == "" { - continue - } - labels = append(labels, attribute.String(key, value)) - } - - return attribute.NewSet(labels...) -} diff --git a/vendor/github.com/grafana/xk6-output-opentelemetry/pkg/opentelemetry/config.go b/vendor/github.com/grafana/xk6-output-opentelemetry/pkg/opentelemetry/config.go deleted file mode 100644 index 562181b3d1b..00000000000 --- a/vendor/github.com/grafana/xk6-output-opentelemetry/pkg/opentelemetry/config.go +++ /dev/null @@ -1,279 +0,0 @@ -package opentelemetry - -import ( - "encoding/json" - "errors" - "fmt" - "strings" - "time" - - "github.com/mstoykov/envconfig" - "go.k6.io/k6/errext" - "go.k6.io/k6/errext/exitcodes" - k6Const "go.k6.io/k6/lib/consts" - "go.k6.io/k6/lib/types" - "gopkg.in/guregu/null.v3" -) - -const ( - // grpcExporterType GRPC exporter type - grpcExporterType = "grpc" - // httpExporterType HTTP exporter type - httpExporterType = "http" -) - -// Config represents the configuration for the OpenTelemetry output -type Config struct { - // ServiceName is the name of the service to use for the metrics - // export, if not set it will use "k6" - ServiceName null.String `json:"serviceName" envconfig:"K6_OTEL_SERVICE_NAME"` - // ServiceVersion is the version of the service to use for the metrics - // export, if not set it will use k6's library version - ServiceVersion null.String `json:"serviceVersion" envconfig:"K6_OTEL_SERVICE_VERSION"` - // MetricPrefix is the prefix to use for the metrics - MetricPrefix null.String `json:"metricPrefix" envconfig:"K6_OTEL_METRIC_PREFIX"` - // FlushInterval is the interval at which to flush metrics from the k6 - FlushInterval types.NullDuration `json:"flushInterval" envconfig:"K6_OTEL_FLUSH_INTERVAL"` - - // ExporterType sets the type of OpenTelemetry Exporter to use - ExporterType null.String `json:"exporterType" envconfig:"K6_OTEL_EXPORTER_TYPE"` - // ExportInterval configures the intervening time between metrics exports - ExportInterval types.NullDuration `json:"exportInterval" envconfig:"K6_OTEL_EXPORT_INTERVAL"` - - // Headers in W3C Correlation-Context format without additional semi-colon delimited metadata (i.e. "k1=v1,k2=v2") - Headers null.String `json:"headers" envconfig:"K6_OTEL_HEADERS"` - - // TLSInsecureSkipVerify disables verification of the server's certificate chain - TLSInsecureSkipVerify null.Bool `json:"tlsInsecureSkipVerify" envconfig:"K6_OTEL_TLS_INSECURE_SKIP_VERIFY"` - // TLSCertificate is the path to the certificate file (rootCAs) to use for the exporter's TLS connection - TLSCertificate null.String `json:"tlsCertificate" envconfig:"K6_OTEL_TLS_CERTIFICATE"` - // TLSClientCertificate is the path to the certificate file (must be PEM encoded data) - // to use for the exporter's TLS connection - TLSClientCertificate null.String `json:"tlsClientCertificate" envconfig:"K6_OTEL_TLS_CLIENT_CERTIFICATE"` - // TLSClientKey is the path to the private key file (must be PEM encoded data) to use for the exporter's TLS connection - TLSClientKey null.String `json:"tlsClientKey" envconfig:"K6_OTEL_TLS_CLIENT_KEY"` - - // HTTPExporterInsecure disables client transport security for the Exporter's HTTP - // connection. - HTTPExporterInsecure null.Bool `json:"httpExporterInsecure" envconfig:"K6_OTEL_HTTP_EXPORTER_INSECURE"` - // HTTPExporterEndpoint sets the target endpoint the OpenTelemetry Exporter - // will connect to. - HTTPExporterEndpoint null.String `json:"httpExporterEndpoint" envconfig:"K6_OTEL_HTTP_EXPORTER_ENDPOINT"` - // HTTPExporterURLPath sets the target URL path the OpenTelemetry Exporter - HTTPExporterURLPath null.String `json:"httpExporterURLPath" envconfig:"K6_OTEL_HTTP_EXPORTER_URL_PATH"` - - // GRPCExporterEndpoint sets the target endpoint the OpenTelemetry Exporter - // will connect to. - GRPCExporterEndpoint null.String `json:"grpcExporterEndpoint" envconfig:"K6_OTEL_GRPC_EXPORTER_ENDPOINT"` - // GRPCExporterInsecure disables client transport security for the Exporter's gRPC - // connection. - GRPCExporterInsecure null.Bool `json:"grpcExporterInsecure" envconfig:"K6_OTEL_GRPC_EXPORTER_INSECURE"` -} - -// GetConsolidatedConfig combines the options' values from the different sources -// and returns the merged options. The Order of precedence used is documented -// in the k6 Documentation https://grafana.com/docs/k6/latest/using-k6/k6-options/how-to/#order-of-precedence. -func GetConsolidatedConfig(jsonRawConf json.RawMessage, env map[string]string) (Config, error) { - cfg := newDefaultConfig() - if jsonRawConf != nil { - jsonConf, err := parseJSON(jsonRawConf) - if err != nil { - return cfg, fmt.Errorf("parse JSON options failed: %w", err) - } - cfg = cfg.Apply(jsonConf) - } - - if len(env) > 0 { - envConf, err := parseEnvs(env) - if err != nil { - return cfg, fmt.Errorf("parse environment variables options failed: %w", err) - } - cfg = cfg.Apply(envConf) - } - - if err := cfg.Validate(); err != nil { - // TODO: check why k6's still exiting with 255 - return cfg, errext.WithExitCodeIfNone( - fmt.Errorf("error validating OpenTelemetry output config: %w", err), - exitcodes.InvalidConfig, - ) - } - - return cfg, nil -} - -// newDefaultConfig creates a new default config with default values -func newDefaultConfig() Config { - return Config{ - ServiceName: null.StringFrom("k6"), - ServiceVersion: null.StringFrom(k6Const.Version), - ExporterType: null.StringFrom(grpcExporterType), - - HTTPExporterInsecure: null.BoolFrom(false), - HTTPExporterEndpoint: null.StringFrom("localhost:4318"), - HTTPExporterURLPath: null.StringFrom("/v1/metrics"), - - GRPCExporterInsecure: null.BoolFrom(false), - GRPCExporterEndpoint: null.StringFrom("localhost:4317"), - - ExportInterval: types.NullDurationFrom(10 * time.Second), - FlushInterval: types.NullDurationFrom(1 * time.Second), - } -} - -// Apply applies the new config to the existing one -func (cfg Config) Apply(v Config) Config { - if v.ServiceName.Valid { - cfg.ServiceName = v.ServiceName - } - - if v.ServiceVersion.Valid { - cfg.ServiceVersion = v.ServiceVersion - } - - if v.MetricPrefix.Valid { - cfg.MetricPrefix = v.MetricPrefix - } - - if v.FlushInterval.Valid { - cfg.FlushInterval = v.FlushInterval - } - - if v.ExporterType.Valid { - cfg.ExporterType = v.ExporterType - } - - if v.ExportInterval.Valid { - cfg.ExportInterval = v.ExportInterval - } - - if v.HTTPExporterInsecure.Valid { - cfg.HTTPExporterInsecure = v.HTTPExporterInsecure - } - - if v.HTTPExporterEndpoint.Valid { - cfg.HTTPExporterEndpoint = v.HTTPExporterEndpoint - } - - if v.HTTPExporterURLPath.Valid { - cfg.HTTPExporterURLPath = v.HTTPExporterURLPath - } - - if v.GRPCExporterEndpoint.Valid { - cfg.GRPCExporterEndpoint = v.GRPCExporterEndpoint - } - - if v.GRPCExporterInsecure.Valid { - cfg.GRPCExporterInsecure = v.GRPCExporterInsecure - } - - if v.TLSInsecureSkipVerify.Valid { - cfg.TLSInsecureSkipVerify = v.TLSInsecureSkipVerify - } - - if v.TLSCertificate.Valid { - cfg.TLSCertificate = v.TLSCertificate - } - - if v.TLSClientCertificate.Valid { - cfg.TLSClientCertificate = v.TLSClientCertificate - } - - if v.TLSClientKey.Valid { - cfg.TLSClientKey = v.TLSClientKey - } - - if v.Headers.Valid { - cfg.Headers = v.Headers - } - - return cfg -} - -// Validate validates the config -func (cfg Config) Validate() error { - if cfg.ServiceName.String == "" { - return errors.New("providing service name is required") - } - - // TODO: it's not actually required, but we should probably have a default - // check if it works without it - if cfg.ServiceVersion.String == "" { - return errors.New("providing service version is required") - } - - if cfg.ExporterType.String != grpcExporterType && cfg.ExporterType.String != httpExporterType { - return fmt.Errorf( - "unsupported exporter type %q, currently only %q and %q are supported", - cfg.ExporterType.String, - grpcExporterType, - httpExporterType, - ) - } - - if cfg.ExporterType.String == grpcExporterType { - if cfg.GRPCExporterEndpoint.String == "" { - return errors.New("gRPC exporter endpoint is required") - } - } - - if cfg.ExporterType.String == httpExporterType { - endpoint := cfg.HTTPExporterEndpoint.String - if endpoint == "" { - return errors.New("HTTP exporter endpoint is required") - } - - if strings.HasPrefix(endpoint, "http://") || - strings.HasPrefix(endpoint, "https://") { - return errors.New("HTTP exporter endpoint must only be host and port, no scheme") - } - } - - return nil -} - -// String returns a string representation of the config -func (cfg Config) String() string { - var endpoint string - exporter := cfg.ExporterType.String - - if cfg.ExporterType.String == httpExporterType { - endpoint = "http" - if !cfg.HTTPExporterInsecure.Bool { - endpoint += "s" - } - - endpoint += "://" + cfg.HTTPExporterEndpoint.String + cfg.HTTPExporterURLPath.String - } else { - endpoint = cfg.GRPCExporterEndpoint.String - - if cfg.GRPCExporterInsecure.Bool { - exporter += " (insecure)" - } - } - - return fmt.Sprintf("%s, %s", exporter, endpoint) -} - -// parseJSON parses the supplied JSON into a Config. -func parseJSON(data json.RawMessage) (Config, error) { - var c Config - err := json.Unmarshal(data, &c) - return c, err -} - -// parseEnvs parses the supplied environment variables into a Config. -func parseEnvs(env map[string]string) (Config, error) { - cfg := Config{} - - if serviceName, ok := env["OTEL_SERVICE_NAME"]; ok { - cfg.ServiceName = null.StringFrom(serviceName) - } - - err := envconfig.Process("K6_OTEL_", &cfg, func(key string) (string, bool) { - v, ok := env[key] - return v, ok - }) - - return cfg, err -} diff --git a/vendor/github.com/grafana/xk6-output-opentelemetry/pkg/opentelemetry/exporter.go b/vendor/github.com/grafana/xk6-output-opentelemetry/pkg/opentelemetry/exporter.go deleted file mode 100644 index 877994193d2..00000000000 --- a/vendor/github.com/grafana/xk6-output-opentelemetry/pkg/opentelemetry/exporter.go +++ /dev/null @@ -1,127 +0,0 @@ -package opentelemetry - -import ( - "context" - "crypto/tls" - "errors" - "fmt" - "net/url" - "strings" - - "go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc" - "go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp" - "go.opentelemetry.io/otel/sdk/metric" - "google.golang.org/grpc/credentials" -) - -func getExporter(cfg Config) (metric.Exporter, error) { - // at the point of writing this code - // ctx isn't used at any point in the exporter - // later on, it could be used for the connection timeout - ctx := context.Background() - - tlsConfig, err := buildTLSConfig( - cfg.TLSInsecureSkipVerify, - cfg.TLSCertificate, - cfg.TLSClientCertificate, - cfg.TLSClientKey, - ) - if err != nil { - return nil, err - } - - var headers map[string]string - if cfg.Headers.Valid { - headers, err = parseHeaders(cfg.Headers.String) - if err != nil { - return nil, fmt.Errorf("failed to parse headers: %w", err) - } - } - - exporterType := cfg.ExporterType.String - - if exporterType == grpcExporterType { - return buildGRPCExporter(ctx, cfg, tlsConfig, headers) - } - - if exporterType == httpExporterType { - return buildHTTPExporter(ctx, cfg, tlsConfig, headers) - } - - return nil, errors.New("unsupported exporter type " + exporterType + " specified") -} - -func buildHTTPExporter( - ctx context.Context, - cfg Config, - tlsConfig *tls.Config, - headers map[string]string, -) (metric.Exporter, error) { - opts := []otlpmetrichttp.Option{ - otlpmetrichttp.WithEndpoint(cfg.HTTPExporterEndpoint.String), - otlpmetrichttp.WithURLPath(cfg.HTTPExporterURLPath.String), - } - - if cfg.HTTPExporterInsecure.Bool { - opts = append(opts, otlpmetrichttp.WithInsecure()) - } - - if len(headers) > 0 { - opts = append(opts, otlpmetrichttp.WithHeaders(headers)) - } - - if tlsConfig != nil { - opts = append(opts, otlpmetrichttp.WithTLSClientConfig(tlsConfig)) - } - - return otlpmetrichttp.New(ctx, opts...) -} - -func buildGRPCExporter( - ctx context.Context, - cfg Config, - tlsConfig *tls.Config, - headers map[string]string, -) (metric.Exporter, error) { - opt := []otlpmetricgrpc.Option{ - otlpmetricgrpc.WithEndpoint(cfg.GRPCExporterEndpoint.String), - } - - if cfg.GRPCExporterInsecure.Bool { - opt = append(opt, otlpmetricgrpc.WithInsecure()) - } - - if len(headers) > 0 { - opt = append(opt, otlpmetricgrpc.WithHeaders(headers)) - } - - if tlsConfig != nil { - opt = append(opt, otlpmetricgrpc.WithTLSCredentials(credentials.NewTLS(tlsConfig))) - } - - return otlpmetricgrpc.New(ctx, opt...) -} - -func parseHeaders(raw string) (map[string]string, error) { - headers := make(map[string]string) - for _, header := range strings.Split(raw, ",") { - rawKey, rawValue, ok := strings.Cut(header, "=") - if !ok { - return nil, fmt.Errorf("invalid header %q, expected format key=value", header) - } - - key, err := url.PathUnescape(rawKey) - if err != nil { - return nil, fmt.Errorf("failed to unescape header key %q: %w", rawKey, err) - } - - value, err := url.PathUnescape(rawValue) - if err != nil { - return nil, fmt.Errorf("failed to unescape header value %q: %w", rawValue, err) - } - - headers[key] = value - } - - return headers, nil -} diff --git a/vendor/github.com/grafana/xk6-output-opentelemetry/pkg/opentelemetry/output.go b/vendor/github.com/grafana/xk6-output-opentelemetry/pkg/opentelemetry/output.go deleted file mode 100644 index 2795e7ff4b8..00000000000 --- a/vendor/github.com/grafana/xk6-output-opentelemetry/pkg/opentelemetry/output.go +++ /dev/null @@ -1,205 +0,0 @@ -// Package opentelemetry performs output operations for the opentelemetry extension -package opentelemetry - -import ( - "context" - "fmt" - "time" - - "github.com/sirupsen/logrus" - otelMetric "go.opentelemetry.io/otel/metric" - "go.opentelemetry.io/otel/sdk/metric" - "go.opentelemetry.io/otel/sdk/resource" - semconv "go.opentelemetry.io/otel/semconv/v1.24.0" - - "go.k6.io/k6/metrics" - "go.k6.io/k6/output" -) - -// Output implements the lib.Output interface -type Output struct { - output.SampleBuffer - - config Config - periodicFlusher *output.PeriodicFlusher - logger logrus.FieldLogger - - meterProvider *metric.MeterProvider - metricsRegistry *registry -} - -var _ output.WithStopWithTestError = new(Output) - -// New creates an instance of the collector -func New(p output.Params) (*Output, error) { - conf, err := GetConsolidatedConfig(p.JSONConfig, p.Environment) - if err != nil { - return nil, err - } - - return &Output{ - config: conf, - logger: p.Logger, - }, nil -} - -// Description returns a human-readable description of the output that will be shown in `k6 run` -func (o *Output) Description() string { - return fmt.Sprintf("opentelemetry (%s)", o.config) -} - -// StopWithTestError flushes all remaining metrics and finalizes the test run -func (o *Output) StopWithTestError(_ error) error { - o.logger.Debug("Stopping...") - defer o.logger.Debug("Stopped!") - - if err := o.meterProvider.Shutdown(context.Background()); err != nil { - o.logger.WithError(err).Error("can't shutdown OpenTelemetry metric provider") - } - - o.periodicFlusher.Stop() - - return nil -} - -// Stop just implements an old interface (output.Output) -func (o *Output) Stop() error { - return o.StopWithTestError(nil) -} - -// Start performs initialization tasks prior to Engine using the output -func (o *Output) Start() error { - o.logger.Debug("Starting output...") - - exp, err := getExporter(o.config) - if err != nil { - return fmt.Errorf("failed to create OpenTelemetry exporter: %w", err) - } - - res, err := resource.Merge(resource.Default(), - resource.NewSchemaless( - semconv.ServiceName(o.config.ServiceName.String), - semconv.ServiceVersion(o.config.ServiceVersion.String), - )) - if err != nil { - return fmt.Errorf("failed to create OpenTelemetry resource: %w", err) - } - - meterProvider := metric.NewMeterProvider( - metric.WithResource(res), - metric.WithReader( - metric.NewPeriodicReader( - exp, - metric.WithInterval(o.config.ExportInterval.TimeDuration()), - ), - ), - ) - - pf, err := output.NewPeriodicFlusher(o.config.FlushInterval.TimeDuration(), o.flushMetrics) - if err != nil { - return err - } - - o.logger.Debug("Started!") - o.periodicFlusher = pf - o.meterProvider = meterProvider - o.metricsRegistry = newRegistry(meterProvider.Meter("k6"), o.logger) - - return nil -} - -func (o *Output) flushMetrics() { - samples := o.GetBufferedSamples() - start := time.Now() - var count, errCount int - for _, sc := range samples { - samples := sc.GetSamples() - - for _, sample := range samples { - if err := o.dispatch(sample); err != nil { - o.logger.WithError(err).Error("Error dispatching sample") - errCount++ - - continue - } - count++ - } - } - - if count > 0 { - o.logger. - WithField("t", time.Since(start)). - WithField("count", count). - Debug("registered metrics in OpenTelemetry metric provider") - } - - if errCount > 0 { - o.logger. - WithField("t", time.Since(start)). - WithField("count", errCount). - Warn("can't flush some metrics") - } -} - -func (o *Output) dispatch(entry metrics.Sample) error { - ctx := context.Background() - name := normalizeMetricName(o.config, entry.Metric.Name) - - attributeSet := newAttributeSet(entry.Tags) - attributeSetOpt := otelMetric.WithAttributeSet(attributeSet) - - unit := normalizeUnit(entry.Metric.Contains) - - switch entry.Metric.Type { - case metrics.Counter: - counter, err := o.metricsRegistry.getOrCreateCounter(name, unit) - if err != nil { - return err - } - - counter.Add(ctx, entry.Value, attributeSetOpt) - case metrics.Gauge: - gauge, err := o.metricsRegistry.getOrCreateGauge(name, unit) - if err != nil { - return err - } - - gauge.Record(ctx, entry.Value, attributeSetOpt) - case metrics.Trend: - trend, err := o.metricsRegistry.getOrCreateHistogram(name, unit) - if err != nil { - return err - } - - trend.Record(ctx, entry.Value, attributeSetOpt) - case metrics.Rate: - nonZero, total, err := o.metricsRegistry.getOrCreateCountersForRate(name) - if err != nil { - return err - } - - if entry.Value != 0 { - nonZero.Add(ctx, 1, attributeSetOpt) - } - total.Add(ctx, 1, attributeSetOpt) - default: - o.logger.Warnf("metric %q has unsupported metric type", entry.Metric.Name) - } - - return nil -} - -func normalizeMetricName(cfg Config, name string) string { - return cfg.MetricPrefix.String + name -} - -func normalizeUnit(vt metrics.ValueType) string { - switch vt { - case metrics.Time: - return "ms" - case metrics.Data: - return "By" - default: - return "" - } -} diff --git a/vendor/github.com/grafana/xk6-output-opentelemetry/pkg/opentelemetry/registry.go b/vendor/github.com/grafana/xk6-output-opentelemetry/pkg/opentelemetry/registry.go deleted file mode 100644 index ed0420c741c..00000000000 --- a/vendor/github.com/grafana/xk6-output-opentelemetry/pkg/opentelemetry/registry.go +++ /dev/null @@ -1,151 +0,0 @@ -package opentelemetry - -import ( - "fmt" - "sync" - - "github.com/sirupsen/logrus" - otelMetric "go.opentelemetry.io/otel/metric" -) - -// registry keep track of all metrics that have been used. -type registry struct { - meter otelMetric.Meter - logger logrus.FieldLogger - - counters sync.Map - gauges sync.Map - histograms sync.Map - rateCounters sync.Map -} - -// newRegistry creates a new registry. -func newRegistry(meter otelMetric.Meter, logger logrus.FieldLogger) *registry { - return ®istry{ - meter: meter, - logger: logger, - } -} - -func (r *registry) getOrCreateCounter(name, unit string) (otelMetric.Float64Counter, error) { - if counter, ok := r.counters.Load(name); ok { - if v, ok := counter.(otelMetric.Float64Counter); ok { - return v, nil - } - - return nil, fmt.Errorf("metric %q is not a counter", name) - } - - opts := []otelMetric.Float64CounterOption{} - if unit != "" { - opts = append(opts, otelMetric.WithUnit(unit)) - } - - c, err := r.meter.Float64Counter(name, opts...) - if err != nil { - return nil, fmt.Errorf("failed to create counter for %q: %w", name, err) - } - - r.logger.Debugf("registered counter metric %q", name) - - r.counters.Store(name, c) - return c, nil -} - -func (r *registry) getOrCreateHistogram(name, unit string) (otelMetric.Float64Histogram, error) { - if histogram, ok := r.histograms.Load(name); ok { - if v, ok := histogram.(otelMetric.Float64Histogram); ok { - return v, nil - } - - return nil, fmt.Errorf("metric %q is not a histogram", name) - } - - opts := []otelMetric.Float64HistogramOption{} - if unit != "" { - opts = append(opts, otelMetric.WithUnit(unit)) - } - - h, err := r.meter.Float64Histogram(name, opts...) - if err != nil { - return nil, fmt.Errorf("failed to create histogram for %q: %w", name, err) - } - - r.logger.Debugf("registered histogram metric %q", name) - - r.histograms.Store(name, h) - return h, nil -} - -func (r *registry) getOrCreateCountersForRate(name string) (otelMetric.Int64Counter, otelMetric.Int64Counter, error) { - // k6's rate metric tracks how frequently a non-zero value occurs. - // so to correctly calculate the rate in a metrics backend - // we need to split the rate metric into two counters: - // 2. number of non-zero occurrences - // 1. the total number of occurrences - - nonZeroName := name + ".occurred" - totalName := name + ".total" - - var err error - var nonZeroCounter, totalCounter otelMetric.Int64Counter - - storedNonZeroCounter, ok := r.rateCounters.Load(nonZeroName) - if !ok { - nonZeroCounter, err = r.meter.Int64Counter(nonZeroName) - if err != nil { - return nil, nil, fmt.Errorf("failed to create counter for %q: %w", nonZeroName, err) - } - - r.rateCounters.Store(nonZeroName, nonZeroCounter) - r.logger.Debugf("registered counter metric %q", nonZeroName) - } else { - nonZeroCounter, ok = storedNonZeroCounter.(otelMetric.Int64Counter) - if !ok { - return nil, nil, fmt.Errorf("metric %q stored not as counter", nonZeroName) - } - } - - storedTotalCounter, ok := r.rateCounters.Load(totalName) - if !ok { - totalCounter, err = r.meter.Int64Counter(totalName) - if err != nil { - return nil, nil, fmt.Errorf("failed to create counter for %q: %w", totalName, err) - } - - r.rateCounters.Store(totalName, totalCounter) - r.logger.Debugf("registered counter metric %q", totalName) - } else { - totalCounter, ok = storedTotalCounter.(otelMetric.Int64Counter) - if !ok { - return nil, nil, fmt.Errorf("metric %q stored not as counter", totalName) - } - } - - return nonZeroCounter, totalCounter, nil -} - -func (r *registry) getOrCreateGauge(name, unit string) (otelMetric.Float64Gauge, error) { - if gauge, ok := r.gauges.Load(name); ok { - if v, ok := gauge.(otelMetric.Float64Gauge); ok { - return v, nil - } - - return nil, fmt.Errorf("metric %q is not a gauge", name) - } - - opts := []otelMetric.Float64GaugeOption{} - if unit != "" { - opts = append(opts, otelMetric.WithUnit(unit)) - } - - gauge, err := r.meter.Float64Gauge(name, opts...) - if err != nil { - return nil, fmt.Errorf("failed to create gauge for %q: %w", name, err) - } - - r.logger.Debugf("registered gauge metric %q ", name) - - r.gauges.Store(name, gauge) - return gauge, nil -} diff --git a/vendor/github.com/grafana/xk6-output-opentelemetry/pkg/opentelemetry/tls.go b/vendor/github.com/grafana/xk6-output-opentelemetry/pkg/opentelemetry/tls.go deleted file mode 100644 index cff39c4908b..00000000000 --- a/vendor/github.com/grafana/xk6-output-opentelemetry/pkg/opentelemetry/tls.go +++ /dev/null @@ -1,57 +0,0 @@ -package opentelemetry - -import ( - "crypto/tls" - "crypto/x509" - "errors" - "fmt" - "os" - - "gopkg.in/guregu/null.v3" -) - -func buildTLSConfig( - insecureSkipVerify null.Bool, - certPath, clientCertPath, clientKeyPath null.String, -) (*tls.Config, error) { - set := false - tlsConfig := &tls.Config{} //nolint:gosec // it's up to the caller - - if insecureSkipVerify.Valid { - tlsConfig.InsecureSkipVerify = insecureSkipVerify.Bool - set = true - } - - // Load the root certificate - if certPath.Valid { - b, err := os.ReadFile(certPath.String) //nolint:forbidigo - if err != nil { - return nil, fmt.Errorf("failed to read root certificate from %q: %w", certPath.String, err) - } - - cp := x509.NewCertPool() - if ok := cp.AppendCertsFromPEM(b); !ok { - return nil, errors.New("failed to append root certificate to the pool") - } - - tlsConfig.RootCAs = cp - set = true - } - - // Load the client certificate - if clientCertPath.Valid { - cert, err := tls.LoadX509KeyPair(clientCertPath.String, clientKeyPath.String) - if err != nil { - return nil, fmt.Errorf("failed to load client certificate: %w", err) - } - - tlsConfig.Certificates = []tls.Certificate{cert} - set = true - } - - if !set { - return nil, nil //nolint:nilnil // no TLS config set - } - - return tlsConfig, nil -} diff --git a/vendor/modules.txt b/vendor/modules.txt index 3c99e7cac11..01454f9e829 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -182,9 +182,6 @@ github.com/grafana/sobek/unistring # github.com/grafana/xk6-dashboard v0.7.5 ## explicit; go 1.20 github.com/grafana/xk6-dashboard/dashboard -# github.com/grafana/xk6-output-opentelemetry v0.3.0 -## explicit; go 1.21 -github.com/grafana/xk6-output-opentelemetry/pkg/opentelemetry # github.com/grafana/xk6-redis v0.3.3 ## explicit; go 1.20 github.com/grafana/xk6-redis/redis