diff --git a/go.mod b/go.mod index 4cedd2830..a164b5c60 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/coocood/freecache v1.2.5 github.com/pulumi/pulumi-command/sdk v1.2.1 github.com/pulumi/pulumi-random/sdk/v4 v4.19.1 - github.com/pulumi/pulumi/sdk/v3 v3.225.1 + github.com/pulumi/pulumi/sdk/v3 v3.226.0 github.com/sirupsen/logrus v1.9.4 github.com/spf13/cobra v1.10.2 ) @@ -18,13 +18,13 @@ require ( github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resourcegraph/armresourcegraph v0.9.0 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.2.0 github.com/aws/amazon-ec2-instance-selector/v3 v3.1.3 - github.com/aws/aws-sdk-go-v2 v1.41.3 + github.com/aws/aws-sdk-go-v2 v1.41.4 github.com/aws/aws-sdk-go-v2/config v1.32.11 github.com/aws/aws-sdk-go-v2/service/ec2 v1.294.0 - github.com/aws/aws-sdk-go-v2/service/s3 v1.96.4 + github.com/aws/aws-sdk-go-v2/service/s3 v1.97.1 github.com/aws/aws-sdk-go-v2/service/sts v1.41.8 github.com/pulumi/pulumi-aws-native/sdk v1.57.0 - github.com/pulumi/pulumi-aws/sdk/v7 v7.21.0 + github.com/pulumi/pulumi-aws/sdk/v7 v7.23.0 github.com/pulumi/pulumi-awsx/sdk/v3 v3.3.0 github.com/pulumi/pulumi-azure-native-sdk/authorization/v3 v3.15.0 github.com/pulumi/pulumi-azure-native-sdk/compute/v3 v3.15.0 @@ -35,7 +35,7 @@ require ( github.com/pulumi/pulumi-azure-native-sdk/storage/v3 v3.15.0 github.com/pulumi/pulumi-gitlab/sdk/v8 v8.11.0 github.com/pulumi/pulumi-tls/sdk/v5 v5.3.0 - golang.org/x/exp v0.0.0-20260218203240-3dfff04db8fa + golang.org/x/exp v0.0.0-20260312153236-7ab1446f8b90 k8s.io/apimachinery v0.35.2 k8s.io/client-go v0.35.2 ) @@ -51,10 +51,10 @@ require ( ) require ( - github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.6 // indirect - github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.20 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.11 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.19 // indirect + github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.7 // indirect + github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.21 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.12 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.20 // indirect github.com/aws/aws-sdk-go-v2/service/pricing v1.40.13 // indirect github.com/blang/semver/v4 v4.0.0 // indirect github.com/evertras/bubble-table v0.19.2 // indirect @@ -64,8 +64,8 @@ require ( github.com/oliveagle/jsonpath v0.1.4 // indirect github.com/patrickmn/go-cache v2.1.0+incompatible // indirect github.com/sahilm/fuzzy v0.1.1 // indirect - golang.org/x/mod v0.33.0 - golang.org/x/tools v0.42.0 // indirect + golang.org/x/mod v0.34.0 + golang.org/x/tools v0.43.0 // indirect ) require ( @@ -80,11 +80,11 @@ require ( github.com/atotto/clipboard v0.1.4 // indirect github.com/aws/aws-sdk-go-v2/credentials v1.19.11 // indirect github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.19 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.19 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.19 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.20 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.20 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.8.5 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.6 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.19 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.7 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.20 // indirect github.com/aws/aws-sdk-go-v2/service/signin v1.0.7 // indirect github.com/aws/aws-sdk-go-v2/service/sso v1.30.12 // indirect github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.16 // indirect @@ -135,7 +135,7 @@ require ( github.com/pjbgf/sha1cd v0.5.0 // indirect github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231 // indirect - github.com/pulumi/esc v0.22.0 // indirect + github.com/pulumi/esc v0.23.0 // indirect github.com/pulumi/pulumi-docker-build/sdk/go/dockerbuild v0.0.15 // indirect github.com/sagikazarmark/locafero v0.12.0 // indirect github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect @@ -147,27 +147,27 @@ require ( github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect github.com/zclconf/go-cty v1.18.0 // indirect go.opentelemetry.io/auto/sdk v1.2.1 // indirect - go.opentelemetry.io/collector/featuregate v1.53.0 // indirect - go.opentelemetry.io/collector/pdata v1.53.0 // indirect + go.opentelemetry.io/collector/featuregate v1.54.0 // indirect + go.opentelemetry.io/collector/pdata v1.54.0 // indirect go.opentelemetry.io/otel v1.42.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.42.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.42.0 // indirect go.opentelemetry.io/otel/metric v1.42.0 // indirect go.opentelemetry.io/otel/sdk v1.42.0 // indirect go.opentelemetry.io/otel/trace v1.42.0 // indirect - go.opentelemetry.io/proto/otlp v1.9.0 // indirect + go.opentelemetry.io/proto/otlp v1.10.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.yaml.in/yaml/v2 v2.4.3 // indirect go.yaml.in/yaml/v3 v3.0.4 // indirect golang.org/x/oauth2 v0.36.0 // indirect golang.org/x/sync v0.20.0 // indirect golang.org/x/time v0.15.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20260226221140-a57be14db171 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20260316180232-0b37fe3546d5 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20260316180232-0b37fe3546d5 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/klog/v2 v2.140.0 // indirect - k8s.io/kube-openapi v0.0.0-20260304202019-5b3e3fdb0acf // indirect + k8s.io/kube-openapi v0.0.0-20260317180543-43fb72c5454a // indirect k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2 // indirect sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect sigs.k8s.io/randfill v1.0.0 // indirect @@ -179,7 +179,7 @@ require ( github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armsubscriptions v1.3.0 github.com/Microsoft/go-winio v0.6.2 // indirect github.com/ProtonMail/go-crypto v1.4.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ecs v1.73.1 + github.com/aws/aws-sdk-go-v2/service/ecs v1.74.0 github.com/aws/aws-sdk-go-v2/service/iam v1.53.4 github.com/blang/semver v3.5.1+incompatible // indirect github.com/cheggaaa/pb v1.0.29 // indirect @@ -204,7 +204,7 @@ require ( github.com/opentracing/opentracing-go v1.2.0 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pkg/term v1.1.0 // indirect - github.com/pulumi/pulumi-kubernetes/sdk/v4 v4.27.0 + github.com/pulumi/pulumi-kubernetes/sdk/v4 v4.28.0 github.com/rivo/uniseg v0.4.7 // indirect github.com/rogpeppe/go-internal v1.14.1 // indirect github.com/sergi/go-diff v1.4.0 // indirect @@ -215,11 +215,11 @@ require ( github.com/uber/jaeger-lib v2.4.1+incompatible // indirect github.com/xanzy/ssh-agent v0.3.3 // indirect go.uber.org/atomic v1.11.0 // indirect - golang.org/x/crypto v0.48.0 // indirect - golang.org/x/net v0.51.0 // indirect + golang.org/x/crypto v0.49.0 // indirect + golang.org/x/net v0.52.0 // indirect golang.org/x/sys v0.42.0 // indirect - golang.org/x/term v0.40.0 // indirect - golang.org/x/text v0.34.0 // indirect + golang.org/x/term v0.41.0 // indirect + golang.org/x/text v0.35.0 // indirect google.golang.org/grpc v1.79.2 // indirect google.golang.org/protobuf v1.36.11 // indirect gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect diff --git a/go.sum b/go.sum index 9a832a22a..d69f0c3e2 100644 --- a/go.sum +++ b/go.sum @@ -51,42 +51,42 @@ github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI= github.com/aws/amazon-ec2-instance-selector/v3 v3.1.3 h1:13qtG4reL2+2UiCm2U7gM9QJthDO8hPPzvn7hTjHask= github.com/aws/amazon-ec2-instance-selector/v3 v3.1.3/go.mod h1:wdlMRtz9G4IO6H1yZPsqfGBxR8E6B/bdxHlGkls4kGQ= -github.com/aws/aws-sdk-go-v2 v1.41.3 h1:4kQ/fa22KjDt13QCy1+bYADvdgcxpfH18f0zP542kZA= -github.com/aws/aws-sdk-go-v2 v1.41.3/go.mod h1:mwsPRE8ceUUpiTgF7QmQIJ7lgsKUPQOUl3o72QBrE1o= -github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.6 h1:N4lRUXZpZ1KVEUn6hxtco/1d2lgYhNn1fHkkl8WhlyQ= -github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.6/go.mod h1:lyw7GFp3qENLh7kwzf7iMzAxDn+NzjXEAGjKS2UOKqI= +github.com/aws/aws-sdk-go-v2 v1.41.4 h1:10f50G7WyU02T56ox1wWXq+zTX9I1zxG46HYuG1hH/k= +github.com/aws/aws-sdk-go-v2 v1.41.4/go.mod h1:mwsPRE8ceUUpiTgF7QmQIJ7lgsKUPQOUl3o72QBrE1o= +github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.7 h1:3kGOqnh1pPeddVa/E37XNTaWJ8W6vrbYV9lJEkCnhuY= +github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.7/go.mod h1:lyw7GFp3qENLh7kwzf7iMzAxDn+NzjXEAGjKS2UOKqI= github.com/aws/aws-sdk-go-v2/config v1.32.11 h1:ftxI5sgz8jZkckuUHXfC/wMUc8u3fG1vQS0plr2F2Zs= github.com/aws/aws-sdk-go-v2/config v1.32.11/go.mod h1:twF11+6ps9aNRKEDimksp923o44w/Thk9+8YIlzWMmo= github.com/aws/aws-sdk-go-v2/credentials v1.19.11 h1:NdV8cwCcAXrCWyxArt58BrvZJ9pZ9Fhf9w6Uh5W3Uyc= github.com/aws/aws-sdk-go-v2/credentials v1.19.11/go.mod h1:30yY2zqkMPdrvxBqzI9xQCM+WrlrZKSOpSJEsylVU+8= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.19 h1:INUvJxmhdEbVulJYHI061k4TVuS3jzzthNvjqvVvTKM= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.19/go.mod h1:FpZN2QISLdEBWkayloda+sZjVJL+e9Gl0k1SyTgcswU= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.19 h1:/sECfyq2JTifMI2JPyZ4bdRN77zJmr6SrS1eL3augIA= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.19/go.mod h1:dMf8A5oAqr9/oxOfLkC/c2LU/uMcALP0Rgn2BD5LWn0= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.19 h1:AWeJMk33GTBf6J20XJe6qZoRSJo0WfUhsMdUKhoODXE= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.19/go.mod h1:+GWrYoaAsV7/4pNHpwh1kiNLXkKaSoppxQq9lbH8Ejw= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.20 h1:CNXO7mvgThFGqOFgbNAP2nol2qAWBOGfqR/7tQlvLmc= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.20/go.mod h1:oydPDJKcfMhgfcgBUZaG+toBbwy8yPWubJXBVERtI4o= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.20 h1:tN6W/hg+pkM+tf9XDkWUbDEjGLb+raoBMFsTodcoYKw= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.20/go.mod h1:YJ898MhD067hSHA6xYCx5ts/jEd8BSOLtQDL3iZsvbc= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.5 h1:clHU5fm//kWS1C2HgtgWxfQbFbx4b6rx+5jzhgX9HrI= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.5/go.mod h1:O3h0IK87yXci+kg6flUKzJnWeziQUKciKrLjcatSNcY= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.20 h1:qi3e/dmpdONhj1RyIZdi6DKKpDXS5Lb8ftr3p7cyHJc= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.20/go.mod h1:V1K+TeJVD5JOk3D9e5tsX2KUdL7BlB+FV6cBhdobN8c= +github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.21 h1:SwGMTMLIlvDNyhMteQ6r8IJSBPlRdXX5d4idhIGbkXA= +github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.21/go.mod h1:UUxgWxofmOdAMuqEsSppbDtGKLfR04HGsD0HXzvhI1k= github.com/aws/aws-sdk-go-v2/service/ec2 v1.294.0 h1:776KnBqePBBR6zEDi0bUIHXzUBOISa2WgAKEgckUF8M= github.com/aws/aws-sdk-go-v2/service/ec2 v1.294.0/go.mod h1:rB577GvkmJADVOFGY8/j9sPv/ewcsEtQNsd9Lrn7Zx0= -github.com/aws/aws-sdk-go-v2/service/ecs v1.73.1 h1:TSmcWx+RzhGJrPNoFkuqANafJQ7xY3W2UBg6ShN3ae8= -github.com/aws/aws-sdk-go-v2/service/ecs v1.73.1/go.mod h1:KWILGx+bRowcGyJU/va2Ift48c658blP5e1qvldnIRE= +github.com/aws/aws-sdk-go-v2/service/ecs v1.74.0 h1:YS5TXaEvzDb+sV+wdQFUtuCAk0GeFR9Ai6HFdxpz6q8= +github.com/aws/aws-sdk-go-v2/service/ecs v1.74.0/go.mod h1:10kBgdaNJz0FO/+JWDUH+0rtSjkn5yafgavDDmmhFzs= github.com/aws/aws-sdk-go-v2/service/iam v1.53.4 h1:FUWGS7m97SYL0bk9Kb+Q4bVpcSrKOHNiIbEXIRFTRW4= github.com/aws/aws-sdk-go-v2/service/iam v1.53.4/go.mod h1:seDE466zJ4haVuAVcRk+yIH4DWb3s6cqt3Od8GxnGAA= -github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.6 h1:XAq62tBTJP/85lFD5oqOOe7YYgWxY9LvWq8plyDvDVg= -github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.6/go.mod h1:x0nZssQ3qZSnIcePWLvcoFisRXJzcTVvYpAAdYX8+GI= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.11 h1:BYf7XNsJMzl4mObARUBUib+j2tf0U//JAAtTnYqvqCw= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.11/go.mod h1:aEUS4WrNk/+FxkBZZa7tVgp4pGH+kFGW40Y8rCPqt5g= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.19 h1:X1Tow7suZk9UCJHE1Iw9GMZJJl0dAnKXXP1NaSDHwmw= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.19/go.mod h1:/rARO8psX+4sfjUQXp5LLifjUt8DuATZ31WptNJTyQA= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.19 h1:JnQeStZvPHFHeyky/7LbMlyQjUa+jIBj36OlWm0pzIk= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.19/go.mod h1:HGyasyHvYdFQeJhvDHfH7HXkHh57htcJGKDZ+7z+I24= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.7 h1:5EniKhLZe4xzL7a+fU3C2tfUN4nWIqlLesfrjkuPFTY= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.7/go.mod h1:x0nZssQ3qZSnIcePWLvcoFisRXJzcTVvYpAAdYX8+GI= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.12 h1:qtJZ70afD3ISKWnoX3xB0J2otEqu3LqicRcDBqsj0hQ= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.12/go.mod h1:v2pNpJbRNl4vEUWEh5ytQok0zACAKfdmKS51Hotc3pQ= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.20 h1:2HvVAIq+YqgGotK6EkMf+KIEqTISmTYh5zLpYyeTo1Y= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.20/go.mod h1:V4X406Y666khGa8ghKmphma/7C0DAtEQYhkq9z4vpbk= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.20 h1:siU1A6xjUZ2N8zjTHSXFhB9L/2OY8Dqs0xXiLjF30jA= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.20/go.mod h1:4TLZCmVJDM3FOu5P5TJP0zOlu9zWgDWU7aUxWbr+rcw= github.com/aws/aws-sdk-go-v2/service/pricing v1.40.13 h1:zuo2FmpYZfANk5REBqD8OaEoDR+p28WDm799D3ySqUY= github.com/aws/aws-sdk-go-v2/service/pricing v1.40.13/go.mod h1:sVKRpoK0drDqf/V7cSBMu0xL/dV3YTNKtRbfF+u5hDA= -github.com/aws/aws-sdk-go-v2/service/s3 v1.96.4 h1:4ExZyubQ6LQQVuF2Qp9OsfEvsTdAWh5Gfwf6PgIdLdk= -github.com/aws/aws-sdk-go-v2/service/s3 v1.96.4/go.mod h1:NF3JcMGOiARAss1ld3WGORCw71+4ExDD2cbbdKS5PpA= +github.com/aws/aws-sdk-go-v2/service/s3 v1.97.1 h1:csi9NLpFZXb9fxY7rS1xVzgPRGMt7MSNWeQ6eo247kE= +github.com/aws/aws-sdk-go-v2/service/s3 v1.97.1/go.mod h1:qXVal5H0ChqXP63t6jze5LmFalc7+ZE7wOdLtZ0LCP0= github.com/aws/aws-sdk-go-v2/service/signin v1.0.7 h1:Y2cAXlClHsXkkOvWZFXATr34b0hxxloeQu/pAZz2row= github.com/aws/aws-sdk-go-v2/service/signin v1.0.7/go.mod h1:idzZ7gmDeqeNrSPkdbtMp9qWMgcBwykA7P7Rzh5DXVU= github.com/aws/aws-sdk-go-v2/service/sso v1.30.12 h1:iSsvB9EtQ09YrsmIc44Heqlx5ByGErqhPK1ZQLppias= @@ -101,6 +101,8 @@ github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiE github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8= github.com/aymanbagabas/go-udiff v0.3.1 h1:LV+qyBQ2pqe0u42ZsUEtPiCaUoqgA9gYRDs3vj1nolY= github.com/aymanbagabas/go-udiff v0.3.1/go.mod h1:G0fsKmG+P6ylD0r6N/KgQD/nWzgfnl8ZBcNLgcbrw8E= +github.com/bazelbuild/buildtools v0.0.0-20260211083412-859bfffeef82 h1:PmoVmwzAnGb0iCjulb7Mgsaqw2Wj36LQJ8VyYaFe/ak= +github.com/bazelbuild/buildtools v0.0.0-20260211083412-859bfffeef82/go.mod h1:PLNUetjLa77TCCziPsz0EI8a6CUxgC+1jgmWv0H25tg= github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ= github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM= @@ -167,6 +169,14 @@ github.com/fxamacker/cbor/v2 v2.9.0 h1:NpKPmjDBgUfBms6tr6JZkTHtfFGcMKsw3eGcmD/sa github.com/fxamacker/cbor/v2 v2.9.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ= github.com/gabriel-vasile/mimetype v1.4.13 h1:46nXokslUBsAJE/wMsp5gtO500a4F3Nkz9Ufpk2AcUM= github.com/gabriel-vasile/mimetype v1.4.13/go.mod h1:d+9Oxyo1wTzWdyVUPMmXFvp4F9tea18J8ufA774AB3s= +github.com/git-pkgs/manifests v0.4.1 h1:CWml+TrRXVzrfNJ2pTNKLqyi+9y/BFiQP/BX3pL4pPQ= +github.com/git-pkgs/manifests v0.4.1/go.mod h1:7SPFwU9diUG1Az682/p4ZupHJkfpbWKwRvNPwCcOeVs= +github.com/git-pkgs/packageurl-go v0.2.1 h1:j6VnjJiYS9b1nTLfJGsG6SLaA7Nk6Io+ta8grOyTa4o= +github.com/git-pkgs/packageurl-go v0.2.1/go.mod h1:rcIxiG37BlQLB6FZfgdj9Fm7yjhRQd3l+5o7J0QPAk4= +github.com/git-pkgs/purl v0.1.8 h1:iyjEHM2WIZUL9A3+q9ylrabqILsN4nOay9X6jfEjmzQ= +github.com/git-pkgs/purl v0.1.8/go.mod h1:ihlHw3bnSLXat+9Nl9MsJZBYiG7s3NkwmvE3L/Es/sI= +github.com/git-pkgs/vers v0.2.2 h1:42QkiIURhGN2wM8AuYYU+FbzS1YV6jmdGd1RiFp7gXs= +github.com/git-pkgs/vers v0.2.2/go.mod h1:biTbSQK1qdbrsxDEKnqe3Jzclxz8vW6uDcwKjfUGcOo= github.com/gliderlabs/ssh v0.3.8 h1:a4YXD1V7xMF9g5nTkdfnja3Sxy1PVDCj1Zg4Wb8vY6c= github.com/gliderlabs/ssh v0.3.8/go.mod h1:xYoytBv1sV0aL3CavoDuJIQNURXkkfPA/wxQ1pL1fAU= github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI= @@ -332,12 +342,12 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231 h1:vkHw5I/plNdTr435cARxCW6q9gc0S/Yxz7Mkd38pOb0= github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231/go.mod h1:murToZ2N9hNJzewjHBgfFdXhZKjY3z5cYC1VXk+lbFE= -github.com/pulumi/esc v0.22.0 h1:Kbk0kIPsoIu6vnLgKtiE8AKRfl8B8bg6adiQuwJiBjA= -github.com/pulumi/esc v0.22.0/go.mod h1:mkghIFn/TvN3XnP4jmCB4U5BG1I4UjGluARi39ckrCE= +github.com/pulumi/esc v0.23.0 h1:5lOXO+5vvXOEQxXw7cTuYhjg9lVng23f9XNLWDR9EP4= +github.com/pulumi/esc v0.23.0/go.mod h1:mkghIFn/TvN3XnP4jmCB4U5BG1I4UjGluARi39ckrCE= github.com/pulumi/pulumi-aws-native/sdk v1.57.0 h1:It+iBKVjnlB7aKMdTXegPSZ6hlElWdzjpQjcsw1CQAM= github.com/pulumi/pulumi-aws-native/sdk v1.57.0/go.mod h1:mZqNmPQKFtR3F21zQSsjb/2O25tb+9wV2BnO6W2X9bg= -github.com/pulumi/pulumi-aws/sdk/v7 v7.21.0 h1:r9BtOd8R5Y8uHjx8xJJRQuNP5U2YZevyeuZqFT4Rwyw= -github.com/pulumi/pulumi-aws/sdk/v7 v7.21.0/go.mod h1:ZfWMh9R4tKLJadncyFVPIhaEr4mqLcS84jF9r3YtXkE= +github.com/pulumi/pulumi-aws/sdk/v7 v7.23.0 h1:G4x1vd3JgtuEmzWF8h6Yoo2wYDB3ydZT/XxNaPxJ8PU= +github.com/pulumi/pulumi-aws/sdk/v7 v7.23.0/go.mod h1:XDXYVcBL20h4r2kXzpD34pB6gVcyb7MSG1DQP91gzFE= github.com/pulumi/pulumi-awsx/sdk/v3 v3.3.0 h1:FnBJCueeAyLQyDY1JyJz8coMI8C6ltFVQHN6OXj2QV4= github.com/pulumi/pulumi-awsx/sdk/v3 v3.3.0/go.mod h1:2/RMtCM6nOYsWHV0rFZRze7PdSMIKM61ZHbDGEwMaOs= github.com/pulumi/pulumi-azure-native-sdk/authorization/v3 v3.15.0 h1:ixiRpCi/rDZonx6u2Ekm2vyt2AvkPTBiFOsvr26/6ms= @@ -364,14 +374,14 @@ github.com/pulumi/pulumi-docker/sdk/v4 v4.11.0 h1:I8nJlJcQQiMs0njR1/CvXWk2y0dzhw github.com/pulumi/pulumi-docker/sdk/v4 v4.11.0/go.mod h1:TbjBDNYFkMGmDZdrV6grRy+7AADkGLTcPjLHY9gh8dg= github.com/pulumi/pulumi-gitlab/sdk/v8 v8.11.0 h1:nR406lhXeltZVfLXH8E4J5JetflNZePBgXz2eyHT7RM= github.com/pulumi/pulumi-gitlab/sdk/v8 v8.11.0/go.mod h1:TU9R5gbZHqe1iJ054UW3ygPU8PxQcOi4J2n/YsnTviE= -github.com/pulumi/pulumi-kubernetes/sdk/v4 v4.27.0 h1:l33vcOD62jlEIiD/POknlKrVF4JG2ZV87khzavYwkR0= -github.com/pulumi/pulumi-kubernetes/sdk/v4 v4.27.0/go.mod h1:B998wofejDKAvvpLwsi4UMfWDFHHBnzYiM8mZ9e7OSo= +github.com/pulumi/pulumi-kubernetes/sdk/v4 v4.28.0 h1:muCE6cUJ4YmAaNLiOhbjEicxT+10i/EGsZrx2ZZQQ+o= +github.com/pulumi/pulumi-kubernetes/sdk/v4 v4.28.0/go.mod h1:B998wofejDKAvvpLwsi4UMfWDFHHBnzYiM8mZ9e7OSo= github.com/pulumi/pulumi-random/sdk/v4 v4.19.1 h1:MUr4+gUQy+wqhoHsuhXO6ypT40KhU9j/2DT05YU9KIg= github.com/pulumi/pulumi-random/sdk/v4 v4.19.1/go.mod h1:AJpJvPU3qJaq02VUui3rMZHchvVpTvVuVp0lbCeEE50= github.com/pulumi/pulumi-tls/sdk/v5 v5.3.0 h1:T5flLAVyTUbnNRbKMpwMpHoNiquxRlGzpevYkan5ZkM= github.com/pulumi/pulumi-tls/sdk/v5 v5.3.0/go.mod h1:dGWmFbFPclMTOrhpYtXN6trciFHZR08p31S6TqRrLzo= -github.com/pulumi/pulumi/sdk/v3 v3.225.1 h1:yn64PBZocE0Ums82fc6jaWRZthZ352BFi/tVAs5jrps= -github.com/pulumi/pulumi/sdk/v3 v3.225.1/go.mod h1:kiwkjulVm9ibqTOcyrZYhaRZsDSxWpzIKPXtCFeffBE= +github.com/pulumi/pulumi/sdk/v3 v3.226.0 h1:C24HWnoJSspq/KweSkAAAqWht/5pEkDanoxHe0al/dM= +github.com/pulumi/pulumi/sdk/v3 v3.226.0/go.mod h1:l88lS+aGRt37BD/nyPMEOYw+RmjG5baSH7eLtmTKpy0= github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ= @@ -434,12 +444,12 @@ github.com/zclconf/go-cty v1.18.0 h1:pJ8+HNI4gFoyRNqVE37wWbJWVw43BZczFo7KUoRczaA github.com/zclconf/go-cty v1.18.0/go.mod h1:qpnV6EDNgC1sns/AleL1fvatHw72j+S+nS+MJ+T2CSg= go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64= go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y= -go.opentelemetry.io/collector/featuregate v1.53.0 h1:cgjXdtl7jezWxq6V0eohe/JqjY4PBotZGb5+bTR2OJw= -go.opentelemetry.io/collector/featuregate v1.53.0/go.mod h1:PS7zY/zaCb28EqciePVwRHVhc3oKortTFXsi3I6ee4g= -go.opentelemetry.io/collector/internal/testutil v0.147.0 h1:DFlRxBRp23/sZnpTITK25yqe0d56yNvK+63IaWc6OsU= -go.opentelemetry.io/collector/internal/testutil v0.147.0/go.mod h1:Jkjs6rkqs973LqgZ0Fe3zrokQRKULYXPIf4HuqStiEE= -go.opentelemetry.io/collector/pdata v1.53.0 h1:DlYDbRwammEZaxDZHINx5v0n8SEOVNniPbi6FRTlVkA= -go.opentelemetry.io/collector/pdata v1.53.0/go.mod h1:LRSYGNjKXaUrZEwZv3Yl+8/zV2HmRGKXW62zB2bysms= +go.opentelemetry.io/collector/featuregate v1.54.0 h1:ufo5Hy4Co9pcHVg24hyanm8qFG3TkkYbVyQXPVAbwDc= +go.opentelemetry.io/collector/featuregate v1.54.0/go.mod h1:PS7zY/zaCb28EqciePVwRHVhc3oKortTFXsi3I6ee4g= +go.opentelemetry.io/collector/internal/testutil v0.148.0 h1:3Z9hperte3vSmbBTYeNndoEUICICrNz8hzx+v0FYXBQ= +go.opentelemetry.io/collector/internal/testutil v0.148.0/go.mod h1:Jkjs6rkqs973LqgZ0Fe3zrokQRKULYXPIf4HuqStiEE= +go.opentelemetry.io/collector/pdata v1.54.0 h1:3LharKb792cQ3VrUGxd3IcpWwfu3ST+GSTU382jVz1s= +go.opentelemetry.io/collector/pdata v1.54.0/go.mod h1:+MqC3VVOv/EX9YVFUo+mI4F0YmwJ+fXBYwjmu+mRiZ8= go.opentelemetry.io/otel v1.42.0 h1:lSQGzTgVR3+sgJDAU/7/ZMjN9Z+vUip7leaqBKy4sho= go.opentelemetry.io/otel v1.42.0/go.mod h1:lJNsdRMxCUIWuMlVJWzecSMuNjE7dOYyWlqOXWkdqCc= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.42.0 h1:THuZiwpQZuHPul65w4WcwEnkX2QIuMT+UFoOrygtoJw= @@ -454,14 +464,14 @@ go.opentelemetry.io/otel/sdk/metric v1.42.0 h1:D/1QR46Clz6ajyZ3G8SgNlTJKBdGp84q9 go.opentelemetry.io/otel/sdk/metric v1.42.0/go.mod h1:Ua6AAlDKdZ7tdvaQKfSmnFTdHx37+J4ba8MwVCYM5hc= go.opentelemetry.io/otel/trace v1.42.0 h1:OUCgIPt+mzOnaUTpOQcBiM/PLQ/Op7oq6g4LenLmOYY= go.opentelemetry.io/otel/trace v1.42.0/go.mod h1:f3K9S+IFqnumBkKhRJMeaZeNk9epyhnCmQh/EysQCdc= -go.opentelemetry.io/proto/otlp v1.9.0 h1:l706jCMITVouPOqEnii2fIAuO3IVGBRPV5ICjceRb/A= -go.opentelemetry.io/proto/otlp v1.9.0/go.mod h1:xE+Cx5E/eEHw+ISFkwPLwCZefwVjY+pqKg1qcK03+/4= -go.opentelemetry.io/proto/slim/otlp v1.9.0 h1:fPVMv8tP3TrsqlkH1HWYUpbCY9cAIemx184VGkS6vlE= -go.opentelemetry.io/proto/slim/otlp v1.9.0/go.mod h1:xXdeJJ90Gqyll+orzUkY4bOd2HECo5JofeoLpymVqdI= -go.opentelemetry.io/proto/slim/otlp/collector/profiles/v1development v0.2.0 h1:o13nadWDNkH/quoDomDUClnQBpdQQ2Qqv0lQBjIXjE8= -go.opentelemetry.io/proto/slim/otlp/collector/profiles/v1development v0.2.0/go.mod h1:Gyb6Xe7FTi/6xBHwMmngGoHqL0w29Y4eW8TGFzpefGA= -go.opentelemetry.io/proto/slim/otlp/profiles/v1development v0.2.0 h1:EiUYvtwu6PMrMHVjcPfnsG3v+ajPkbUeH+IL93+QYyk= -go.opentelemetry.io/proto/slim/otlp/profiles/v1development v0.2.0/go.mod h1:mUUHKFiN2SST3AhJ8XhJxEoeVW12oqfXog0Bo8W3Ec4= +go.opentelemetry.io/proto/otlp v1.10.0 h1:IQRWgT5srOCYfiWnpqUYz9CVmbO8bFmKcwYxpuCSL2g= +go.opentelemetry.io/proto/otlp v1.10.0/go.mod h1:/CV4QoCR/S9yaPj8utp3lvQPoqMtxXdzn7ozvvozVqk= +go.opentelemetry.io/proto/slim/otlp v1.10.0 h1:iR97Vs/ZDR+y9TfuP9b1XBtdPWeC+OMslIBmhcLU7jM= +go.opentelemetry.io/proto/slim/otlp v1.10.0/go.mod h1:lV9250stpjYLPNA5viFabIgP2QlUGRT1GdTgAf8SIUk= +go.opentelemetry.io/proto/slim/otlp/collector/profiles/v1development v0.3.0 h1:RUF5rO0hAlgiJt1fzQVzcVs3vZVNHIcMLgOgG4rWNcQ= +go.opentelemetry.io/proto/slim/otlp/collector/profiles/v1development v0.3.0/go.mod h1:I89cynRj8y+383o7tEQVg2SVA6SRgDVIouWPUVXjx0U= +go.opentelemetry.io/proto/slim/otlp/profiles/v1development v0.3.0 h1:CQvJSldHRUN6Z8jsUeYv8J0lXRvygALXIzsmAeCcZE0= +go.opentelemetry.io/proto/slim/otlp/profiles/v1development v0.3.0/go.mod h1:xSQ+mEfJe/GjK1LXEyVOoSI1N9JV9ZI923X5kup43W4= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= @@ -476,24 +486,24 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.48.0 h1:/VRzVqiRSggnhY7gNRxPauEQ5Drw9haKdM0jqfcCFts= -golang.org/x/crypto v0.48.0/go.mod h1:r0kV5h3qnFPlQnBSrULhlsRfryS2pmewsg+XfMgkVos= -golang.org/x/exp v0.0.0-20260218203240-3dfff04db8fa h1:Zt3DZoOFFYkKhDT3v7Lm9FDMEV06GpzjG2jrqW+QTE0= -golang.org/x/exp v0.0.0-20260218203240-3dfff04db8fa/go.mod h1:K79w1Vqn7PoiZn+TkNpx3BUWUQksGO3JcVX6qIjytmA= +golang.org/x/crypto v0.49.0 h1:+Ng2ULVvLHnJ/ZFEq4KdcDd/cfjrrjjNSXNzxg0Y4U4= +golang.org/x/crypto v0.49.0/go.mod h1:ErX4dUh2UM+CFYiXZRTcMpEcN8b/1gxEuv3nODoYtCA= +golang.org/x/exp v0.0.0-20260312153236-7ab1446f8b90 h1:jiDhWWeC7jfWqR9c/uplMOqJ0sbNlNWv0UkzE0vX1MA= +golang.org/x/exp v0.0.0-20260312153236-7ab1446f8b90/go.mod h1:xE1HEv6b+1SCZ5/uscMRjUBKtIxworgEcEi+/n9NQDQ= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= 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.33.0 h1:tHFzIWbBifEmbwtGz65eaWyGiGZatSrT9prnU8DbVL8= -golang.org/x/mod v0.33.0/go.mod h1:swjeQEj+6r7fODbD2cqrnje9PnziFuw4bmLbBZFrQ5w= +golang.org/x/mod v0.34.0 h1:xIHgNUUnW6sYkcM5Jleh05DvLOtwc6RitGHbDk4akRI= +golang.org/x/mod v0.34.0/go.mod h1:ykgH52iCZe79kzLLMhyCUzhMci+nQj+0XkbXpNYtVjY= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.51.0 h1:94R/GTO7mt3/4wIKpcR5gkGmRLOuE/2hNGeWq/GBIFo= -golang.org/x/net v0.51.0/go.mod h1:aamm+2QF5ogm02fjy5Bb7CQ0WMt1/WVM7FtyaTLlA9Y= +golang.org/x/net v0.52.0 h1:He/TN1l0e4mmR3QqHMT2Xab3Aj3L9qjbhRm78/6jrW0= +golang.org/x/net v0.52.0/go.mod h1:R1MAz7uMZxVMualyPXb+VaqGSa3LIaUqk0eEt3w36Sw= golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs= golang.org/x/oauth2 v0.36.0/go.mod h1:YDBUJMTkDnJS+A4BP4eZBjCqtokkg1hODuPjwiGPO7Q= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -521,13 +531,13 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo= golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.40.0 h1:36e4zGLqU4yhjlmxEaagx2KuYbJq3EwY8K943ZsHcvg= -golang.org/x/term v0.40.0/go.mod h1:w2P8uVp06p2iyKKuvXIm7N/y0UCRt3UfJTfZ7oOpglM= +golang.org/x/term v0.41.0 h1:QCgPso/Q3RTJx2Th4bDLqML4W6iJiaXFq2/ftQF13YU= +golang.org/x/term v0.41.0/go.mod h1:3pfBgksrReYfZ5lvYM0kSO0LIkAl4Yl2bXOkKP7Ec2A= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.34.0 h1:oL/Qq0Kdaqxa1KbNeMKwQq0reLCCaFtqu2eNuSeNHbk= -golang.org/x/text v0.34.0/go.mod h1:homfLqTYRFyVYemLBFl5GgL/DWEiH5wcsQ5gSh1yziA= +golang.org/x/text v0.35.0 h1:JOVx6vVDFokkpaq1AEptVzLTpDe9KGpj5tR4/X+ybL8= +golang.org/x/text v0.35.0/go.mod h1:khi/HExzZJ2pGnjenulevKNX1W67CUy0AsXcNubPGCA= golang.org/x/time v0.15.0 h1:bbrp8t3bGUeFOx08pvsMYRTCVSMk89u4tKbNOZbp88U= golang.org/x/time v0.15.0/go.mod h1:Y4YMaQmXwGQZoFaVFk4YpCt4FLQMYKZe9oeV/f4MSno= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -536,18 +546,18 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.42.0 h1:uNgphsn75Tdz5Ji2q36v/nsFSfR/9BRFvqhGBaJGd5k= -golang.org/x/tools v0.42.0/go.mod h1:Ma6lCIwGZvHK6XtgbswSoWroEkhugApmsXyrUmBhfr0= +golang.org/x/tools v0.43.0 h1:12BdW9CeB3Z+J/I/wj34VMl8X+fEXBxVR90JeMX5E7s= +golang.org/x/tools v0.43.0/go.mod h1:uHkMso649BX2cZK6+RpuIPXS3ho2hZo4FVwfoy1vIk0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk= gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E= -google.golang.org/genproto/googleapis/api v0.0.0-20260226221140-a57be14db171 h1:tu/dtnW1o3wfaxCOjSLn5IRX4YDcJrtlpzYkhHhGaC4= -google.golang.org/genproto/googleapis/api v0.0.0-20260226221140-a57be14db171/go.mod h1:M5krXqk4GhBKvB596udGL3UyjL4I1+cTbK0orROM9ng= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171 h1:ggcbiqK8WWh6l1dnltU4BgWGIGo+EVYxCaAPih/zQXQ= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= +google.golang.org/genproto/googleapis/api v0.0.0-20260316180232-0b37fe3546d5 h1:CogIeEXn4qWYzzQU0QqvYBM8yDF9cFYzDq9ojSpv0Js= +google.golang.org/genproto/googleapis/api v0.0.0-20260316180232-0b37fe3546d5/go.mod h1:EIQZ5bFCfRQDV4MhRle7+OgjNtZ6P1PiZBgAKuxXu/Y= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260316180232-0b37fe3546d5 h1:aJmi6DVGGIStN9Mobk/tZOOQUBbj0BPjZjjnOdoZKts= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260316180232-0b37fe3546d5/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= google.golang.org/grpc v1.79.2 h1:fRMD94s2tITpyJGtBBn7MkMseNpOZU8ZxgC3MMBaXRU= google.golang.org/grpc v1.79.2/go.mod h1:KmT0Kjez+0dde/v2j9vzwoAScgEPx/Bw1CYChhHLrHQ= google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE= @@ -577,8 +587,8 @@ k8s.io/client-go v0.35.2 h1:YUfPefdGJA4aljDdayAXkc98DnPkIetMl4PrKX97W9o= k8s.io/client-go v0.35.2/go.mod h1:4QqEwh4oQpeK8AaefZ0jwTFJw/9kIjdQi0jpKeYvz7g= k8s.io/klog/v2 v2.140.0 h1:Tf+J3AH7xnUzZyVVXhTgGhEKnFqye14aadWv7bzXdzc= k8s.io/klog/v2 v2.140.0/go.mod h1:o+/RWfJ6PwpnFn7OyAG3QnO47BFsymfEfrz6XyYSSp0= -k8s.io/kube-openapi v0.0.0-20260304202019-5b3e3fdb0acf h1:btPscg4cMql0XdYK2jLsJcNEKmACJz8l+U7geC06FiM= -k8s.io/kube-openapi v0.0.0-20260304202019-5b3e3fdb0acf/go.mod h1:kdmbQkyfwUagLfXIad1y2TdrjPFWp2Q89B3qkRwf/pQ= +k8s.io/kube-openapi v0.0.0-20260317180543-43fb72c5454a h1:xCeOEAOoGYl2jnJoHkC3hkbPJgdATINPMAxaynU2Ovg= +k8s.io/kube-openapi v0.0.0-20260317180543-43fb72c5454a/go.mod h1:uGBT7iTA6c6MvqUvSXIaYZo9ukscABYi2btjhvgKGZ0= k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2 h1:AZYQSJemyQB5eRxqcPky+/7EdBj0xi3g0ZcxxJ7vbWU= k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2/go.mod h1:xDxuJ0whA3d0I4mf/C4ppKHxXynQ+fxnkmQH0vTHnuk= lukechampine.com/frand v1.5.1 h1:fg0eRtdmGFIxhP5zQJzM1lFDbD6CUfu/f+7WgAZd5/w= diff --git a/oci/Containerfile b/oci/Containerfile index b5657b30d..39098fc49 100644 --- a/oci/Containerfile +++ b/oci/Containerfile @@ -1,12 +1,12 @@ -FROM registry.access.redhat.com/ubi9/go-toolset@sha256:71101fd9ba32aabeaec2c073e5786c91642aaee902475fce3d8280457fb19e9d as builder +FROM registry.access.redhat.com/ubi9/go-toolset@sha256:3cdf0d1e8d8601c89fe3070d7aa63a54d1aaf049ba55fba314f6358b1d95a2f9 as builder ARG TARGETARCH USER root WORKDIR /workspace COPY . . # renovate: datasource=github-releases depName=pulumi/pulumi -ENV PULUMI_VERSION 3.225.1 +ENV PULUMI_VERSION 3.226.0 ENV PULUMI_BASE_URL="https://github.com/pulumi/pulumi/releases/download/v${PULUMI_VERSION}/pulumi-v${PULUMI_VERSION}" ENV PULUMI_URL="${PULUMI_BASE_URL}-linux-x64.tar.gz" @@ -19,7 +19,7 @@ RUN unset VERSION \ && tar -xzvf pulumicli.tar.gz # ubi 9.5-1732804088 -FROM registry.access.redhat.com/ubi9/ubi@sha256:cecb1cde7bda7c8165ae27841c2335667f8a3665a349c0d051329c61660a496c +FROM registry.access.redhat.com/ubi9/ubi@sha256:6ed9f6f637fe731d93ec60c065dbced79273f1e0b5f512951f2c0b0baedb16ad ARG TARGETARCH LABEL org.opencontainers.image.authors="Redhat Developer" @@ -32,7 +32,7 @@ ENV AWS_SDK_LOAD_CONFIG=1 \ # Pulumi plugins # renovate: datasource=github-releases depName=pulumi/pulumi-aws -ARG PULUMI_AWS_VERSION=v7.21.0 +ARG PULUMI_AWS_VERSION=v7.23.0 # renovate: datasource=github-releases depName=pulumi/pulumi-awsx ARG PULUMI_AWSX_VERSION=v3.3.0 # renovate: datasource=github-releases depName=pulumi/pulumi-azure-native @@ -46,7 +46,7 @@ ARG PULUMI_RANDOM_VERSION=v4.19.1 # renovate: datasource=github-releases depName=pulumi/pulumi-aws-native ARG PULUMI_AWS_NATIVE_VERSION=v1.57.0 # renovate: datasource=github-releases depName=pulumi/pulumi-gitlab -ARG PULUMI_GITLAB_VERSION=v9.9.0 +ARG PULUMI_GITLAB_VERSION=v9.10.0 ENV PULUMI_HOME "/opt/mapt/run" WORKDIR ${PULUMI_HOME} diff --git a/tools/go.mod b/tools/go.mod index 8f5f43214..bf1459af6 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -26,7 +26,7 @@ require ( github.com/denis-tingaikin/go-header v0.5.0 // indirect github.com/godoc-lint/godoc-lint v0.11.2 // indirect github.com/golangci/asciicheck v0.5.0 // indirect - github.com/golangci/gofmt v0.0.0-20250106114630-d62b90e6713d // indirect + github.com/golangci/gofmt e7be49a5ab4d // indirect github.com/gostaticanalysis/nilerr v0.1.2 // indirect github.com/nunnatsa/ginkgolinter v0.23.0 // indirect ) @@ -165,7 +165,7 @@ require ( github.com/rivo/uniseg v0.4.7 // indirect github.com/rogpeppe/go-internal v1.14.1 // indirect github.com/ryancurrah/gomodguard v1.4.1 // indirect - github.com/ryanrolds/sqlclosecheck v0.5.1 // indirect + github.com/ryanrolds/sqlclosecheck v0.6.0 // indirect github.com/sagikazarmark/locafero v0.12.0 // indirect github.com/sanposhiho/wastedassign/v2 v2.1.0 // indirect github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect @@ -208,12 +208,12 @@ require ( go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.1 // indirect go.yaml.in/yaml/v2 v2.4.3 // indirect - golang.org/x/exp/typeparams v0.0.0-20260218203240-3dfff04db8fa // indirect - golang.org/x/mod v0.33.0 // indirect + golang.org/x/exp/typeparams 7ab1446f8b90 // indirect + golang.org/x/mod v0.34.0 // indirect golang.org/x/sync v0.20.0 // indirect golang.org/x/sys v0.42.0 // indirect - golang.org/x/text v0.34.0 // indirect - golang.org/x/tools v0.42.0 // indirect + golang.org/x/text v0.35.0 // indirect + golang.org/x/tools v0.43.0 // indirect google.golang.org/protobuf v1.36.11 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect honnef.co/go/tools v0.7.0 // indirect diff --git a/vendor/github.com/aws/aws-sdk-go-v2/aws/go_module_metadata.go b/vendor/github.com/aws/aws-sdk-go-v2/aws/go_module_metadata.go index cc5140b70..b46a0afcb 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/aws/go_module_metadata.go +++ b/vendor/github.com/aws/aws-sdk-go-v2/aws/go_module_metadata.go @@ -3,4 +3,4 @@ package aws // goModuleVersion is the tagged release for this module -const goModuleVersion = "1.41.3" +const goModuleVersion = "1.41.4" diff --git a/vendor/github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream/CHANGELOG.md b/vendor/github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream/CHANGELOG.md index c292c41b6..af105a52d 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream/CHANGELOG.md +++ b/vendor/github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream/CHANGELOG.md @@ -1,3 +1,7 @@ +# v1.7.7 (2026-03-13) + +* **Bug Fix**: Replace usages of the old ioutil/ package throughout the SDK. + # v1.7.6 (2026-03-03) * **Bug Fix**: Modernize non codegen files with go fix diff --git a/vendor/github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream/go_module_metadata.go b/vendor/github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream/go_module_metadata.go index cdac6dbc0..21414d681 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream/go_module_metadata.go +++ b/vendor/github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream/go_module_metadata.go @@ -3,4 +3,4 @@ package eventstream // goModuleVersion is the tagged release for this module -const goModuleVersion = "1.7.6" +const goModuleVersion = "1.7.7" diff --git a/vendor/github.com/aws/aws-sdk-go-v2/aws/protocol/query/middleware.go b/vendor/github.com/aws/aws-sdk-go-v2/aws/protocol/query/middleware.go index 360344791..39efd848c 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/aws/protocol/query/middleware.go +++ b/vendor/github.com/aws/aws-sdk-go-v2/aws/protocol/query/middleware.go @@ -3,7 +3,7 @@ package query import ( "context" "fmt" - "io/ioutil" + "io" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" @@ -52,7 +52,7 @@ func (m *asGetRequest) HandleSerialize( delim = "&" } - b, err := ioutil.ReadAll(stream) + b, err := io.ReadAll(stream) if err != nil { return out, metadata, fmt.Errorf("unable to get request body %w", err) } diff --git a/vendor/github.com/aws/aws-sdk-go-v2/aws/transport/http/client.go b/vendor/github.com/aws/aws-sdk-go-v2/aws/transport/http/client.go index c7ef0acc4..49cc31205 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/aws/transport/http/client.go +++ b/vendor/github.com/aws/aws-sdk-go-v2/aws/transport/http/client.go @@ -300,6 +300,17 @@ func limitedRedirect(r *http.Request, via []*http.Request) error { switch resp.StatusCode { case 307, 308: // Only allow 307 and 308 redirects as they preserve the method. + + // If redirecting to a different host, remove X-Amz-Security-Token header + // to prevent credentials from being sent to a different host, similar to + // how Authorization header is handled by the HTTP client. + if len(via) > 0 { + lastRequest := via[len(via)-1] + if lastRequest.URL.Host != r.URL.Host { + r.Header.Del("X-Amz-Security-Token") + } + } + return nil } diff --git a/vendor/github.com/aws/aws-sdk-go-v2/internal/configsources/CHANGELOG.md b/vendor/github.com/aws/aws-sdk-go-v2/internal/configsources/CHANGELOG.md index 71066a9c6..46942eee7 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/internal/configsources/CHANGELOG.md +++ b/vendor/github.com/aws/aws-sdk-go-v2/internal/configsources/CHANGELOG.md @@ -1,3 +1,7 @@ +# v1.4.20 (2026-03-13) + +* **Dependency Update**: Updated to the latest SDK module versions + # v1.4.19 (2026-03-03) * **Bug Fix**: Modernize non codegen files with go fix diff --git a/vendor/github.com/aws/aws-sdk-go-v2/internal/configsources/go_module_metadata.go b/vendor/github.com/aws/aws-sdk-go-v2/internal/configsources/go_module_metadata.go index c42653ca4..2a210bd10 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/internal/configsources/go_module_metadata.go +++ b/vendor/github.com/aws/aws-sdk-go-v2/internal/configsources/go_module_metadata.go @@ -3,4 +3,4 @@ package configsources // goModuleVersion is the tagged release for this module -const goModuleVersion = "1.4.19" +const goModuleVersion = "1.4.20" diff --git a/vendor/github.com/aws/aws-sdk-go-v2/internal/endpoints/v2/CHANGELOG.md b/vendor/github.com/aws/aws-sdk-go-v2/internal/endpoints/v2/CHANGELOG.md index f1ea7ea00..2673108d3 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/internal/endpoints/v2/CHANGELOG.md +++ b/vendor/github.com/aws/aws-sdk-go-v2/internal/endpoints/v2/CHANGELOG.md @@ -1,3 +1,7 @@ +# v2.7.20 (2026-03-13) + +* **Dependency Update**: Updated to the latest SDK module versions + # v2.7.19 (2026-03-03) * **Bug Fix**: Modernize non codegen files with go fix diff --git a/vendor/github.com/aws/aws-sdk-go-v2/internal/endpoints/v2/go_module_metadata.go b/vendor/github.com/aws/aws-sdk-go-v2/internal/endpoints/v2/go_module_metadata.go index 628a5269b..d4052854e 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/internal/endpoints/v2/go_module_metadata.go +++ b/vendor/github.com/aws/aws-sdk-go-v2/internal/endpoints/v2/go_module_metadata.go @@ -3,4 +3,4 @@ package endpoints // goModuleVersion is the tagged release for this module -const goModuleVersion = "2.7.19" +const goModuleVersion = "2.7.20" diff --git a/vendor/github.com/aws/aws-sdk-go-v2/internal/v4a/CHANGELOG.md b/vendor/github.com/aws/aws-sdk-go-v2/internal/v4a/CHANGELOG.md index 87e6e587b..48f2bf86c 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/internal/v4a/CHANGELOG.md +++ b/vendor/github.com/aws/aws-sdk-go-v2/internal/v4a/CHANGELOG.md @@ -1,3 +1,7 @@ +# v1.4.21 (2026-03-13) + +* **Dependency Update**: Updated to the latest SDK module versions + # v1.4.20 (2026-03-05) * **Bug Fix**: Read the correct auth property for SigV4A signing names. diff --git a/vendor/github.com/aws/aws-sdk-go-v2/internal/v4a/go_module_metadata.go b/vendor/github.com/aws/aws-sdk-go-v2/internal/v4a/go_module_metadata.go index 87221df0a..7dd2a095b 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/internal/v4a/go_module_metadata.go +++ b/vendor/github.com/aws/aws-sdk-go-v2/internal/v4a/go_module_metadata.go @@ -3,4 +3,4 @@ package v4a // goModuleVersion is the tagged release for this module -const goModuleVersion = "1.4.20" +const goModuleVersion = "1.4.21" diff --git a/vendor/github.com/aws/aws-sdk-go-v2/service/ecs/CHANGELOG.md b/vendor/github.com/aws/aws-sdk-go-v2/service/ecs/CHANGELOG.md index 65294daf5..656dadf82 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/service/ecs/CHANGELOG.md +++ b/vendor/github.com/aws/aws-sdk-go-v2/service/ecs/CHANGELOG.md @@ -1,3 +1,11 @@ +# v1.74.0 (2026-03-16) + +* **Feature**: Amazon ECS now supports configuring whether tags are propagated to the EC2 Instance Metadata Service (IMDS) for instances launched by the Managed Instances capacity provider. This gives customers control over tag visibility in IMDS when using ECS Managed Instances. + +# v1.73.2 (2026-03-13) + +* **Dependency Update**: Updated to the latest SDK module versions + # v1.73.1 (2026-03-03) * **Dependency Update**: Bump minimum Go version to 1.24 diff --git a/vendor/github.com/aws/aws-sdk-go-v2/service/ecs/deserializers.go b/vendor/github.com/aws/aws-sdk-go-v2/service/ecs/deserializers.go index 65a674c38..8905552b2 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/service/ecs/deserializers.go +++ b/vendor/github.com/aws/aws-sdk-go-v2/service/ecs/deserializers.go @@ -15197,6 +15197,15 @@ func awsAwsjson11_deserializeDocumentInstanceLaunchTemplate(v **types.InstanceLa sv.FipsEnabled = ptr.Bool(jtv) } + case "instanceMetadataTagsPropagation": + if value != nil { + jtv, ok := value.(bool) + if !ok { + return fmt.Errorf("expected BoxedBoolean to be of type *bool, got %T instead", value) + } + sv.InstanceMetadataTagsPropagation = ptr.Bool(jtv) + } + case "instanceRequirements": if err := awsAwsjson11_deserializeDocumentInstanceRequirementsRequest(&sv.InstanceRequirements, value); err != nil { return err diff --git a/vendor/github.com/aws/aws-sdk-go-v2/service/ecs/go_module_metadata.go b/vendor/github.com/aws/aws-sdk-go-v2/service/ecs/go_module_metadata.go index 79d367bbc..9fcf911d8 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/service/ecs/go_module_metadata.go +++ b/vendor/github.com/aws/aws-sdk-go-v2/service/ecs/go_module_metadata.go @@ -3,4 +3,4 @@ package ecs // goModuleVersion is the tagged release for this module -const goModuleVersion = "1.73.1" +const goModuleVersion = "1.74.0" diff --git a/vendor/github.com/aws/aws-sdk-go-v2/service/ecs/serializers.go b/vendor/github.com/aws/aws-sdk-go-v2/service/ecs/serializers.go index 426e00a2d..db94442a7 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/service/ecs/serializers.go +++ b/vendor/github.com/aws/aws-sdk-go-v2/service/ecs/serializers.go @@ -5787,6 +5787,11 @@ func awsAwsjson11_serializeDocumentInstanceLaunchTemplate(v *types.InstanceLaunc ok.Boolean(*v.FipsEnabled) } + if v.InstanceMetadataTagsPropagation != nil { + ok := object.Key("instanceMetadataTagsPropagation") + ok.Boolean(*v.InstanceMetadataTagsPropagation) + } + if v.InstanceRequirements != nil { ok := object.Key("instanceRequirements") if err := awsAwsjson11_serializeDocumentInstanceRequirementsRequest(v.InstanceRequirements, ok); err != nil { @@ -5832,6 +5837,11 @@ func awsAwsjson11_serializeDocumentInstanceLaunchTemplateUpdate(v *types.Instanc ok.String(*v.Ec2InstanceProfileArn) } + if v.InstanceMetadataTagsPropagation != nil { + ok := object.Key("instanceMetadataTagsPropagation") + ok.Boolean(*v.InstanceMetadataTagsPropagation) + } + if v.InstanceRequirements != nil { ok := object.Key("instanceRequirements") if err := awsAwsjson11_serializeDocumentInstanceRequirementsRequest(v.InstanceRequirements, ok); err != nil { diff --git a/vendor/github.com/aws/aws-sdk-go-v2/service/ecs/types/types.go b/vendor/github.com/aws/aws-sdk-go-v2/service/ecs/types/types.go index 7c0fe445e..4b07014da 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/service/ecs/types/types.go +++ b/vendor/github.com/aws/aws-sdk-go-v2/service/ecs/types/types.go @@ -3439,6 +3439,22 @@ type InstanceLaunchTemplate struct { // regions and FIPS disabled in other regions. FipsEnabled *bool + // Determines whether tags are propagated to the instance metadata service (IMDS) + // for Amazon EC2 instances launched by the Managed Instances capacity provider. + // When enabled, all tags associated with the instance are available through the + // instance metadata service. When disabled, tags are not propagated to IMDS. + // + // Disable this setting if your tags contain characters that are not compatible + // with IMDS, such as / . IMDS requires tag keys to match the pattern + // [0-9a-zA-Z\-_+=,.@:]{1,255} . + // + // The default value is true . + // + // For more information, see [Work with instance tags in instance metadata] in the Amazon EC2 User Guide. + // + // [Work with instance tags in instance metadata]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Using_Tags.html#work-with-tags-in-IMDS + InstanceMetadataTagsPropagation *bool + // The instance requirements. You can specify: // // - The instance types @@ -3489,6 +3505,22 @@ type InstanceLaunchTemplateUpdate struct { // [Amazon ECS instance profile for Managed Instances]: https://docs.aws.amazon.com/AmazonECS/latest/developerguide/managed-instances-instance-profile.html Ec2InstanceProfileArn *string + // Determines whether tags are propagated to the instance metadata service (IMDS) + // for Amazon EC2 instances launched by the Managed Instances capacity provider. + // When enabled, all tags associated with the instance are available through the + // instance metadata service. When disabled, tags are not propagated to IMDS. + // + // Disable this setting if your tags contain characters that are not compatible + // with IMDS, such as / . IMDS requires tag keys to match the pattern + // [0-9a-zA-Z\-_+=,.@:]{1,255} . + // + // The default value is true . + // + // For more information, see [Work with instance tags in instance metadata] in the Amazon EC2 User Guide. + // + // [Work with instance tags in instance metadata]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Using_Tags.html#work-with-tags-in-IMDS + InstanceMetadataTagsPropagation *bool + // The updated instance requirements for attribute-based instance type selection. // Changes to instance requirements affect which instance types Amazon ECS selects // for new instances. diff --git a/vendor/github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding/CHANGELOG.md b/vendor/github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding/CHANGELOG.md index b594dddaa..497d37230 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding/CHANGELOG.md +++ b/vendor/github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding/CHANGELOG.md @@ -1,3 +1,7 @@ +# v1.13.7 (2026-03-13) + +* **Bug Fix**: Replace usages of the old ioutil/ package throughout the SDK. + # v1.13.6 (2026-03-03) * **Dependency Update**: Bump minimum Go version to 1.24 diff --git a/vendor/github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding/go_module_metadata.go b/vendor/github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding/go_module_metadata.go index 0ece341c6..5679a2b2b 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding/go_module_metadata.go +++ b/vendor/github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding/go_module_metadata.go @@ -3,4 +3,4 @@ package acceptencoding // goModuleVersion is the tagged release for this module -const goModuleVersion = "1.13.6" +const goModuleVersion = "1.13.7" diff --git a/vendor/github.com/aws/aws-sdk-go-v2/service/internal/checksum/CHANGELOG.md b/vendor/github.com/aws/aws-sdk-go-v2/service/internal/checksum/CHANGELOG.md index 768c3716b..7148221e4 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/service/internal/checksum/CHANGELOG.md +++ b/vendor/github.com/aws/aws-sdk-go-v2/service/internal/checksum/CHANGELOG.md @@ -1,3 +1,8 @@ +# v1.9.12 (2026-03-13) + +* **Bug Fix**: Replace usages of the old ioutil/ package throughout the SDK. +* **Dependency Update**: Updated to the latest SDK module versions + # v1.9.11 (2026-03-03) * **Bug Fix**: Modernize non codegen files with go fix diff --git a/vendor/github.com/aws/aws-sdk-go-v2/service/internal/checksum/go_module_metadata.go b/vendor/github.com/aws/aws-sdk-go-v2/service/internal/checksum/go_module_metadata.go index 0f45aeabc..bdce1ef6a 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/service/internal/checksum/go_module_metadata.go +++ b/vendor/github.com/aws/aws-sdk-go-v2/service/internal/checksum/go_module_metadata.go @@ -3,4 +3,4 @@ package checksum // goModuleVersion is the tagged release for this module -const goModuleVersion = "1.9.11" +const goModuleVersion = "1.9.12" diff --git a/vendor/github.com/aws/aws-sdk-go-v2/service/internal/presigned-url/CHANGELOG.md b/vendor/github.com/aws/aws-sdk-go-v2/service/internal/presigned-url/CHANGELOG.md index 6be7fa536..0a52b84b6 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/service/internal/presigned-url/CHANGELOG.md +++ b/vendor/github.com/aws/aws-sdk-go-v2/service/internal/presigned-url/CHANGELOG.md @@ -1,3 +1,7 @@ +# v1.13.20 (2026-03-13) + +* **Dependency Update**: Updated to the latest SDK module versions + # v1.13.19 (2026-03-03) * **Bug Fix**: Modernize non codegen files with go fix diff --git a/vendor/github.com/aws/aws-sdk-go-v2/service/internal/presigned-url/go_module_metadata.go b/vendor/github.com/aws/aws-sdk-go-v2/service/internal/presigned-url/go_module_metadata.go index 983aaa4b6..f65e864d0 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/service/internal/presigned-url/go_module_metadata.go +++ b/vendor/github.com/aws/aws-sdk-go-v2/service/internal/presigned-url/go_module_metadata.go @@ -3,4 +3,4 @@ package presignedurl // goModuleVersion is the tagged release for this module -const goModuleVersion = "1.13.19" +const goModuleVersion = "1.13.20" diff --git a/vendor/github.com/aws/aws-sdk-go-v2/service/internal/s3shared/CHANGELOG.md b/vendor/github.com/aws/aws-sdk-go-v2/service/internal/s3shared/CHANGELOG.md index da0728750..1e5b70f75 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/service/internal/s3shared/CHANGELOG.md +++ b/vendor/github.com/aws/aws-sdk-go-v2/service/internal/s3shared/CHANGELOG.md @@ -1,3 +1,7 @@ +# v1.19.20 (2026-03-13) + +* **Dependency Update**: Updated to the latest SDK module versions + # v1.19.19 (2026-03-03) * **Bug Fix**: Modernize non codegen files with go fix diff --git a/vendor/github.com/aws/aws-sdk-go-v2/service/internal/s3shared/go_module_metadata.go b/vendor/github.com/aws/aws-sdk-go-v2/service/internal/s3shared/go_module_metadata.go index 87ec0db1c..47ba8ecd7 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/service/internal/s3shared/go_module_metadata.go +++ b/vendor/github.com/aws/aws-sdk-go-v2/service/internal/s3shared/go_module_metadata.go @@ -3,4 +3,4 @@ package s3shared // goModuleVersion is the tagged release for this module -const goModuleVersion = "1.19.19" +const goModuleVersion = "1.19.20" diff --git a/vendor/github.com/aws/aws-sdk-go-v2/service/s3/CHANGELOG.md b/vendor/github.com/aws/aws-sdk-go-v2/service/s3/CHANGELOG.md index 3017d7236..c7cd4c4ac 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/service/s3/CHANGELOG.md +++ b/vendor/github.com/aws/aws-sdk-go-v2/service/s3/CHANGELOG.md @@ -1,3 +1,12 @@ +# v1.97.1 (2026-03-13) + +* **Bug Fix**: Replace usages of the old ioutil/ package throughout the SDK. +* **Dependency Update**: Updated to the latest SDK module versions + +# v1.97.0 (2026-03-12) + +* **Feature**: Adds support for account regional namespaces for general purpose buckets. The account regional namespace is a reserved subdivision of the global bucket namespace where only your account can create general purpose buckets. + # v1.96.4 (2026-03-05) * **Dependency Update**: Updated to the latest SDK module versions diff --git a/vendor/github.com/aws/aws-sdk-go-v2/service/s3/api_op_CopyObject.go b/vendor/github.com/aws/aws-sdk-go-v2/service/s3/api_op_CopyObject.go index b50e49e34..02b5d6bcc 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/service/s3/api_op_CopyObject.go +++ b/vendor/github.com/aws/aws-sdk-go-v2/service/s3/api_op_CopyObject.go @@ -90,9 +90,11 @@ import ( // // - If the source object that you want to copy is in a directory bucket, you // must have the s3express:CreateSession permission in the Action element of a -// policy to read the object. By default, the session is in the ReadWrite mode. -// If you want to restrict the access, you can explicitly set the -// s3express:SessionMode condition key to ReadOnly on the copy source bucket. +// policy to read the object. If no session mode is specified, the session will be +// created with the maximum allowable privilege, attempting ReadWrite first, then +// ReadOnly if ReadWrite is not permitted. If you want to explicitly restrict the +// access to be read-only, you can set the s3express:SessionMode condition key to +// ReadOnly on the copy source bucket. // // - If the copy destination is a directory bucket, you must have the // s3express:CreateSession permission in the Action element of a policy to write diff --git a/vendor/github.com/aws/aws-sdk-go-v2/service/s3/api_op_CreateBucket.go b/vendor/github.com/aws/aws-sdk-go-v2/service/s3/api_op_CreateBucket.go index a889220ab..2b87aa3a5 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/service/s3/api_op_CreateBucket.go +++ b/vendor/github.com/aws/aws-sdk-go-v2/service/s3/api_op_CreateBucket.go @@ -25,6 +25,18 @@ import ( // There are two types of buckets: general purpose buckets and directory buckets. // For more information about these bucket types, see [Creating, configuring, and working with Amazon S3 buckets]in the Amazon S3 User Guide. // +// General purpose buckets exist in a global namespace, which means that each +// bucket name must be unique across all Amazon Web Services accounts in all the +// Amazon Web Services Regions within a partition. A partition is a grouping of +// Regions. Amazon Web Services currently has four partitions: aws (Standard +// Regions), aws-cn (China Regions), aws-us-gov (Amazon Web Services GovCloud +// (US)), and aws-eusc (European Sovereign Cloud). When you create a general +// purpose bucket, you can choose to create a bucket in the shared global namespace +// or you can choose to create a bucket in your account regional namespace. Your +// account regional namespace is a subdivision of the global namespace that only +// your account can create buckets in. For more information on account regional +// namespaces, see [Namespaces for general purpose buckets]. +// // - General purpose buckets - If you send your CreateBucket request to the // s3.amazonaws.com global endpoint, the request goes to the us-east-1 Region. So // the signature calculations in Signature Version 4 must use us-east-1 as the @@ -120,6 +132,7 @@ import ( // [Creating, configuring, and working with Amazon S3 buckets]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/creating-buckets-s3.html // [Concepts for directory buckets in Local Zones]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/s3-lzs-for-directory-buckets.html // [PutObject]: https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutObject.html +// [Namespaces for general purpose buckets]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/gpbucketnamespaces.html // [DeleteBucket]: https://docs.aws.amazon.com/AmazonS3/latest/API/API_DeleteBucket.html // [CreateBucket]: https://docs.aws.amazon.com/AmazonS3/latest/API/API_control_CreateBucket.html // [Virtual hosting of buckets]: https://docs.aws.amazon.com/AmazonS3/latest/dev/VirtualHosting.html @@ -173,6 +186,27 @@ type CreateBucketInput struct { // This functionality is not supported for directory buckets. ACL types.BucketCannedACL + // Specifies the namespace where you want to create your general purpose bucket. + // When you create a general purpose bucket, you can choose to create a bucket in + // the shared global namespace or you can choose to create a bucket in your account + // regional namespace. Your account regional namespace is a subdivision of the + // global namespace that only your account can create buckets in. For more + // information on bucket namespaces, see [Namespaces for general purpose buckets]. + // + // General purpose buckets in your account regional namespace must follow a + // specific naming convention. These buckets consist of a bucket name prefix that + // you create, and a suffix that contains your 12-digit Amazon Web Services Account + // ID, the Amazon Web Services Region code, and ends with -an . Bucket names must + // follow the format bucket-name-prefix-accountId-region-an (for example, + // amzn-s3-demo-bucket-111122223333-us-west-2-an ). For information about bucket + // naming restrictions, see [Account regional namespace naming rules]in the Amazon S3 User Guide. + // + // This functionality is not supported for directory buckets. + // + // [Account regional namespace naming rules]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/bucketnamingrules.html#account-regional-naming-rules + // [Namespaces for general purpose buckets]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/gpbucketnamespaces.html + BucketNamespace types.BucketNamespace + // The configuration information for the bucket. CreateBucketConfiguration *types.CreateBucketConfiguration diff --git a/vendor/github.com/aws/aws-sdk-go-v2/service/s3/api_op_CreateSession.go b/vendor/github.com/aws/aws-sdk-go-v2/service/s3/api_op_CreateSession.go index 3b9f1a5ea..ea4f7006d 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/service/s3/api_op_CreateSession.go +++ b/vendor/github.com/aws/aws-sdk-go-v2/service/s3/api_op_CreateSession.go @@ -234,11 +234,15 @@ type CreateSessionInput struct { ServerSideEncryption types.ServerSideEncryption // Specifies the mode of the session that will be created, either ReadWrite or - // ReadOnly . By default, a ReadWrite session is created. A ReadWrite session is - // capable of executing all the Zonal endpoint API operations on a directory - // bucket. A ReadOnly session is constrained to execute the following Zonal - // endpoint API operations: GetObject , HeadObject , ListObjectsV2 , - // GetObjectAttributes , ListParts , and ListMultipartUploads . + // ReadOnly . If no session mode is specified, the default behavior attempts to + // create a session with the maximum allowable privilege. It will first attempt to + // create a ReadWrite session, and if that is not allowed by permissions, it will + // attempt to create a ReadOnly session. If neither session type is allowed, the + // request will return an Access Denied error. A ReadWrite session is capable of + // executing all the Zonal endpoint API operations on a directory bucket. A + // ReadOnly session is constrained to execute the following Zonal endpoint API + // operations: GetObject , HeadObject , ListObjectsV2 , GetObjectAttributes , + // ListParts , and ListMultipartUploads . SessionMode types.SessionMode noSmithyDocumentSerde diff --git a/vendor/github.com/aws/aws-sdk-go-v2/service/s3/api_op_DeleteBucketTagging.go b/vendor/github.com/aws/aws-sdk-go-v2/service/s3/api_op_DeleteBucketTagging.go index d46c4a135..8745e236e 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/service/s3/api_op_DeleteBucketTagging.go +++ b/vendor/github.com/aws/aws-sdk-go-v2/service/s3/api_op_DeleteBucketTagging.go @@ -19,9 +19,6 @@ import ( // (ABAC) is not enabled for the bucket. When you [enable ABAC for a general purpose bucket], you can no longer use this // operation for that bucket and must use [UntagResource]instead. // -// if ABAC is not enabled for the bucket. When you [enable ABAC for a general purpose bucket], you can no longer use this -// operation for that bucket and must use [UntagResource]instead. -// // To use this operation, you must have permission to perform the // s3:PutBucketTagging action. By default, the bucket owner has this permission and // can grant this permission to others. diff --git a/vendor/github.com/aws/aws-sdk-go-v2/service/s3/api_op_GetBucketTagging.go b/vendor/github.com/aws/aws-sdk-go-v2/service/s3/api_op_GetBucketTagging.go index c5bb22aac..888333793 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/service/s3/api_op_GetBucketTagging.go +++ b/vendor/github.com/aws/aws-sdk-go-v2/service/s3/api_op_GetBucketTagging.go @@ -18,9 +18,6 @@ import ( // // Returns the tag set associated with the general purpose bucket. // -// if ABAC is not enabled for the bucket. When you [enable ABAC for a general purpose bucket], you can no longer use this -// operation for that bucket and must use [ListTagsForResource]instead. -// // To use this operation, you must have permission to perform the // s3:GetBucketTagging action. By default, the bucket owner has this permission and // can grant this permission to others. @@ -42,9 +39,7 @@ import ( // URL encode this value to my%20%20file.txt . // // [PutBucketTagging]: https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutBucketTagging.html -// [enable ABAC for a general purpose bucket]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/buckets-tagging-enable-abac.html // [DeleteBucketTagging]: https://docs.aws.amazon.com/AmazonS3/latest/API/API_DeleteBucketTagging.html -// [ListTagsForResource]: https://docs.aws.amazon.com/AmazonS3/latest/API/API_control_ListTagsForResource.html func (c *Client) GetBucketTagging(ctx context.Context, params *GetBucketTaggingInput, optFns ...func(*Options)) (*GetBucketTaggingOutput, error) { if params == nil { params = &GetBucketTaggingInput{} diff --git a/vendor/github.com/aws/aws-sdk-go-v2/service/s3/api_op_HeadBucket.go b/vendor/github.com/aws/aws-sdk-go-v2/service/s3/api_op_HeadBucket.go index 29e413e14..587b66e86 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/service/s3/api_op_HeadBucket.go +++ b/vendor/github.com/aws/aws-sdk-go-v2/service/s3/api_op_HeadBucket.go @@ -52,9 +52,11 @@ import ( // information about permissions, see [Managing access permissions to your Amazon S3 resources]in the Amazon S3 User Guide. // // - Directory bucket permissions - You must have the s3express:CreateSession -// permission in the Action element of a policy. By default, the session is in -// the ReadWrite mode. If you want to restrict the access, you can explicitly set -// the s3express:SessionMode condition key to ReadOnly on the bucket. +// permission in the Action element of a policy. If no session mode is specified, +// the session will be created with the maximum allowable privilege, attempting +// ReadWrite first, then ReadOnly if ReadWrite is not permitted. If you want to +// explicitly restrict the access to be read-only, you can set the +// s3express:SessionMode condition key to ReadOnly on the bucket. // // For more information about example bucket policies, see [Example bucket policies for S3 Express One Zone]and [Amazon Web Services Identity and Access Management (IAM) identity-based policies for S3 Express One Zone]in the Amazon S3 // diff --git a/vendor/github.com/aws/aws-sdk-go-v2/service/s3/api_op_UploadPartCopy.go b/vendor/github.com/aws/aws-sdk-go-v2/service/s3/api_op_UploadPartCopy.go index f6a7126e7..ff94b912c 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/service/s3/api_op_UploadPartCopy.go +++ b/vendor/github.com/aws/aws-sdk-go-v2/service/s3/api_op_UploadPartCopy.go @@ -84,9 +84,11 @@ import ( // // - If the source object that you want to copy is in a directory bucket, you // must have the s3express:CreateSession permission in the Action element of a -// policy to read the object. By default, the session is in the ReadWrite mode. -// If you want to restrict the access, you can explicitly set the -// s3express:SessionMode condition key to ReadOnly on the copy source bucket. +// policy to read the object. If no session mode is specified, the session will be +// created with the maximum allowable privilege, attempting ReadWrite first, then +// ReadOnly if ReadWrite is not permitted. If you want to explicitly restrict the +// access to be read-only, you can set the s3express:SessionMode condition key to +// ReadOnly on the copy source bucket. // // - If the copy destination is a directory bucket, you must have the // s3express:CreateSession permission in the Action element of a policy to write diff --git a/vendor/github.com/aws/aws-sdk-go-v2/service/s3/go_module_metadata.go b/vendor/github.com/aws/aws-sdk-go-v2/service/s3/go_module_metadata.go index 070ece6cd..7f8df3d48 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/service/s3/go_module_metadata.go +++ b/vendor/github.com/aws/aws-sdk-go-v2/service/s3/go_module_metadata.go @@ -3,4 +3,4 @@ package s3 // goModuleVersion is the tagged release for this module -const goModuleVersion = "1.96.4" +const goModuleVersion = "1.97.1" diff --git a/vendor/github.com/aws/aws-sdk-go-v2/service/s3/serializers.go b/vendor/github.com/aws/aws-sdk-go-v2/service/s3/serializers.go index 4730b7a16..4a3500518 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/service/s3/serializers.go +++ b/vendor/github.com/aws/aws-sdk-go-v2/service/s3/serializers.go @@ -644,6 +644,11 @@ func awsRestxml_serializeOpHttpBindingsCreateBucketInput(v *CreateBucketInput, e encoder.SetHeader(locationName).String(string(v.ACL)) } + if len(v.BucketNamespace) > 0 { + locationName := "X-Amz-Bucket-Namespace" + encoder.SetHeader(locationName).String(string(v.BucketNamespace)) + } + if v.GrantFullControl != nil { locationName := "X-Amz-Grant-Full-Control" encoder.SetHeader(locationName).String(*v.GrantFullControl) diff --git a/vendor/github.com/aws/aws-sdk-go-v2/service/s3/types/enums.go b/vendor/github.com/aws/aws-sdk-go-v2/service/s3/types/enums.go index 1a4d118f7..0aa362e8e 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/service/s3/types/enums.go +++ b/vendor/github.com/aws/aws-sdk-go-v2/service/s3/types/enums.go @@ -201,6 +201,25 @@ func (BucketLogsPermission) Values() []BucketLogsPermission { } } +type BucketNamespace string + +// Enum values for BucketNamespace +const ( + BucketNamespaceAccountRegional BucketNamespace = "account-regional" + BucketNamespaceGlobal BucketNamespace = "global" +) + +// Values returns all known values for BucketNamespace. Note that this can be +// expanded in the future, and so it is only as up to date as the client. +// +// The ordering of this slice is not guaranteed to be stable across updates. +func (BucketNamespace) Values() []BucketNamespace { + return []BucketNamespace{ + "account-regional", + "global", + } +} + type BucketType string // Enum values for BucketType diff --git a/vendor/github.com/pulumi/esc/.version b/vendor/github.com/pulumi/esc/.version index 215740905..ca222b7cf 100644 --- a/vendor/github.com/pulumi/esc/.version +++ b/vendor/github.com/pulumi/esc/.version @@ -1 +1 @@ -0.22.0 +0.23.0 diff --git a/vendor/github.com/pulumi/esc/CHANGELOG.md b/vendor/github.com/pulumi/esc/CHANGELOG.md index af99d949e..bda45c6ce 100644 --- a/vendor/github.com/pulumi/esc/CHANGELOG.md +++ b/vendor/github.com/pulumi/esc/CHANGELOG.md @@ -1,5 +1,15 @@ # CHANGELOG +## 0.23.0 + +### Improvements + +- Add warning in CLI when using an ambiguous 2-part environment ref + [#622](https://github.com/pulumi/esc/pull/622) + +- Add support for `fn::final` built-in function that marks values as final and unable to be overwritten. + [#621](https://github.com/pulumi/esc/pull/621) + ## 0.22.0 ### Improvements diff --git a/vendor/github.com/pulumi/esc/CHANGELOG_PENDING.md b/vendor/github.com/pulumi/esc/CHANGELOG_PENDING.md index 5c2a5aa0b..5f2076d07 100644 --- a/vendor/github.com/pulumi/esc/CHANGELOG_PENDING.md +++ b/vendor/github.com/pulumi/esc/CHANGELOG_PENDING.md @@ -1,5 +1,11 @@ ### Improvements +- Add warning in CLI when using an ambiguous 2-part environment ref + [#622](https://github.com/pulumi/esc/pull/622) + +- Add support for `fn::final` built-in function that marks values as final and unable to be overwritten. + [#621](https://github.com/pulumi/esc/pull/621) + ### Bug Fixes ### Breaking changes diff --git a/vendor/github.com/pulumi/esc/ast/expr.go b/vendor/github.com/pulumi/esc/ast/expr.go index a9bd142d3..536c0da6b 100644 --- a/vendor/github.com/pulumi/esc/ast/expr.go +++ b/vendor/github.com/pulumi/esc/ast/expr.go @@ -671,6 +671,25 @@ func FromBase64(value Expr) *FromBase64Expr { return FromBase64Syntax(nil, name, value) } +// FinalExpr marks a value as final, preventing child environments from overriding it. +type FinalExpr struct { + builtinNode + + Value Expr +} + +func FinalSyntax(node *syntax.ObjectNode, name *StringExpr, args Expr) *FinalExpr { + return &FinalExpr{ + builtinNode: builtin(node, name, args), + Value: args, + } +} + +func Final(value Expr) *FinalExpr { + name := String("fn::final") + return FinalSyntax(nil, name, value) +} + // ValidateExpr validates a value against a JSON schema. type ValidateExpr struct { builtinNode @@ -717,6 +736,8 @@ func tryParseFunction(node *syntax.ObjectNode) (Expr, syntax.Diagnostics, bool) switch kvp.Key.Value() { case "fn::concat": parse = parseConcat + case "fn::final": + parse = parseFinal case "fn::validate": parse = parseValidate case "fn::fromJSON": @@ -948,6 +969,10 @@ func parseToString(node *syntax.ObjectNode, name *StringExpr, args Expr) (Expr, return ToStringSyntax(node, name, args), nil } +func parseFinal(node *syntax.ObjectNode, name *StringExpr, args Expr) (Expr, syntax.Diagnostics) { + return FinalSyntax(node, name, args), nil +} + func parseToBase64(node *syntax.ObjectNode, name *StringExpr, args Expr) (Expr, syntax.Diagnostics) { return ToBase64Syntax(node, name, args), nil } diff --git a/vendor/github.com/pulumi/esc/eval/eval.go b/vendor/github.com/pulumi/esc/eval/eval.go index c8372ed8c..7328cecc4 100644 --- a/vendor/github.com/pulumi/esc/eval/eval.go +++ b/vendor/github.com/pulumi/esc/eval/eval.go @@ -26,6 +26,7 @@ import ( "slices" "strings" + "github.com/hashicorp/hcl/v2" "github.com/pulumi/esc" "github.com/pulumi/esc/ast" "github.com/pulumi/esc/internal/spell" @@ -340,6 +341,9 @@ func declare[Expr exprNode](e *evalContext, path string, x Expr, base *value) *e } // Output schema is dynamic - will be determined during evaluation return newExpr(path, repr, schema.Always().Schema(), base) + case *ast.FinalExpr: + repr := &finalExpr{node: x, value: declare(e, "", x.Value, nil)} + return newExpr(path, repr, schema.Always().Schema(), base) case *ast.FromJSONExpr: repr := &fromJSONExpr{node: x, string: declare(e, "", x.String, nil)} return newExpr(path, repr, schema.Always(), base) @@ -588,6 +592,17 @@ func (e *evalContext) evaluateExpr(x *expr, accept *schema.Schema) *value { return val } + // Check if the base value is final. If so, the child cannot override it. + if x.base != nil && x.base.final { + diag := ast.ExprError(x.repr.syntax(), "cannot override final value") + diag.Severity = hcl.DiagWarning + e.diags.Extend(diag) + val := x.base + x.schema = val.schema + x.value = val + return val + } + val := (*value)(nil) switch repr := x.repr.(type) { case *missingExpr: @@ -611,6 +626,8 @@ func (e *evalContext) evaluateExpr(x *expr, accept *schema.Schema) *value { val = e.evaluateBuiltinConcat(x, repr) case *fromBase64Expr: val = e.evaluateBuiltinFromBase64(x, repr) + case *finalExpr: + val = e.evaluateBuiltinFinal(x, repr) case *validateExpr: val = e.evaluateBuiltinValidate(x, repr) case *fromJSONExpr: @@ -1423,6 +1440,17 @@ func (e *evalContext) valueToSchema(v *value) (*schema.Schema, error) { return &s, nil } +// evaluateBuiltinFinal evaluates a call to the fn::final builtin. The inner value is evaluated +// normally, and the result is wrapped with the final flag to prevent overrides in child environments. +func (e *evalContext) evaluateBuiltinFinal(x *expr, repr *finalExpr) *value { + val := e.evaluateExpr(repr.value, schema.Always()) + v := &value{def: x, final: true} + v.schema = val.schema + v.repr = val.repr + v.combine(val) + return v +} + // evaluateBuiltinFromJSON evaluates a call from the fn::fromJSON builtin. func (e *evalContext) evaluateBuiltinFromJSON(x *expr, repr *fromJSONExpr) *value { v := &value{def: x, schema: x.schema} diff --git a/vendor/github.com/pulumi/esc/eval/expr.go b/vendor/github.com/pulumi/esc/eval/expr.go index 33f2d7be8..79ae74888 100644 --- a/vendor/github.com/pulumi/esc/eval/expr.go +++ b/vendor/github.com/pulumi/esc/eval/expr.go @@ -320,6 +320,13 @@ func (x *expr) export(environment string) esc.Expr { ArgSchema: schema.Always().Schema(), Arg: repr.value.export(environment), } + case *finalExpr: + ex.Builtin = &esc.BuiltinExpr{ + Name: repr.node.Name().Value, + NameRange: convertRange(repr.node.Name().Syntax().Syntax().Range(), environment), + ArgSchema: schema.Always().Schema(), + Arg: repr.value.export(environment), + } case *arrayExpr: ex.List = make([]esc.Expr, len(repr.elements)) for i, el := range repr.elements { @@ -568,6 +575,17 @@ func (x *fromBase64Expr) syntax() ast.Expr { return x.node } +// finalExpr represents a call to the fn::final builtin. +type finalExpr struct { + node *ast.FinalExpr + + value *expr +} + +func (x *finalExpr) syntax() ast.Expr { + return x.node +} + // validateExpr represents a call to the fn::validate builtin. type validateExpr struct { node *ast.ValidateExpr diff --git a/vendor/github.com/pulumi/esc/eval/value.go b/vendor/github.com/pulumi/esc/eval/value.go index 34324dd66..9e5b9e9b3 100644 --- a/vendor/github.com/pulumi/esc/eval/value.go +++ b/vendor/github.com/pulumi/esc/eval/value.go @@ -49,6 +49,7 @@ type value struct { unknown bool rotateOnly bool secret bool // true if the value is secret + final bool // true if the value is final and cannot be overridden by child environments repr any // nil | bool | json.Number | string | []*value | map[string]*value } @@ -493,6 +494,7 @@ func (c copier) copy(v *value) *value { schema: v.schema, unknown: v.unknown, secret: v.secret, + final: v.final, repr: repr, } return copy diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v7/go/aws/cloudwatch/logResourcePolicy.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v7/go/aws/cloudwatch/logResourcePolicy.go index fdb7b3582..146b9e794 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v7/go/aws/cloudwatch/logResourcePolicy.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v7/go/aws/cloudwatch/logResourcePolicy.go @@ -123,20 +123,30 @@ import ( // // ## Import // -// Using `pulumi import`, import CloudWatch log resource policies using the policy name. For example: +// Using `pulumi import`, import CloudWatch log resource policies using the policy name for account-scoped policies, or the ARN of the CloudWatch Logs resource to which the policy is attached for resource-scoped policies. For example: // // ```sh -// $ pulumi import aws:cloudwatch/logResourcePolicy:LogResourcePolicy MyPolicy MyPolicy +// $ pulumi import aws:cloudwatch/logResourcePolicy:LogResourcePolicy my_policy_account_scoped my_policy +// ``` +// +// ```sh +// $ pulumi import aws:cloudwatch/logResourcePolicy:LogResourcePolicy my_policy_resource_scoped "arn:aws:logs:us-west-2:123456789012:log-group:/my-log-group" // ``` type LogResourcePolicy struct { pulumi.CustomResourceState // Details of the resource policy, including the identity of the principal that is enabled to put logs to this account. This is formatted as a JSON string. Maximum length of 5120 characters. PolicyDocument pulumi.StringOutput `pulumi:"policyDocument"` - // Name of the resource policy. - PolicyName pulumi.StringOutput `pulumi:"policyName"` + // Name of the resource policy. Exactly one of `policyName` or `resourceArn` must be specified and this argument is required for account-scoped policies. Note that the number of resource policies without `resourceArn` is limited to 10 per region. + PolicyName pulumi.StringPtrOutput `pulumi:"policyName"` + // Scope of the resource policy (`ACCOUNT` or `RESOURCE`). + PolicyScope pulumi.StringOutput `pulumi:"policyScope"` // Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the provider configuration. Region pulumi.StringOutput `pulumi:"region"` + // ARN of the CloudWatch Logs resource to which the resource policy is attached. Exactly one of `policyName` or `resourceArn` must be specified and this argument is required for resource-scoped policies. Only one policy can be attached per log group resource ARN. + ResourceArn pulumi.StringPtrOutput `pulumi:"resourceArn"` + // Revision ID of the resource policy. Only populated for resource-scoped policies. + RevisionId pulumi.StringOutput `pulumi:"revisionId"` } // NewLogResourcePolicy registers a new resource with the given unique name, arguments, and options. @@ -149,9 +159,6 @@ func NewLogResourcePolicy(ctx *pulumi.Context, if args.PolicyDocument == nil { return nil, errors.New("invalid value for required argument 'PolicyDocument'") } - if args.PolicyName == nil { - return nil, errors.New("invalid value for required argument 'PolicyName'") - } opts = internal.PkgResourceDefaultOpts(opts) var resource LogResourcePolicy err := ctx.RegisterResource("aws:cloudwatch/logResourcePolicy:LogResourcePolicy", name, args, &resource, opts...) @@ -177,19 +184,31 @@ func GetLogResourcePolicy(ctx *pulumi.Context, type logResourcePolicyState struct { // Details of the resource policy, including the identity of the principal that is enabled to put logs to this account. This is formatted as a JSON string. Maximum length of 5120 characters. PolicyDocument interface{} `pulumi:"policyDocument"` - // Name of the resource policy. + // Name of the resource policy. Exactly one of `policyName` or `resourceArn` must be specified and this argument is required for account-scoped policies. Note that the number of resource policies without `resourceArn` is limited to 10 per region. PolicyName *string `pulumi:"policyName"` + // Scope of the resource policy (`ACCOUNT` or `RESOURCE`). + PolicyScope *string `pulumi:"policyScope"` // Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the provider configuration. Region *string `pulumi:"region"` + // ARN of the CloudWatch Logs resource to which the resource policy is attached. Exactly one of `policyName` or `resourceArn` must be specified and this argument is required for resource-scoped policies. Only one policy can be attached per log group resource ARN. + ResourceArn *string `pulumi:"resourceArn"` + // Revision ID of the resource policy. Only populated for resource-scoped policies. + RevisionId *string `pulumi:"revisionId"` } type LogResourcePolicyState struct { // Details of the resource policy, including the identity of the principal that is enabled to put logs to this account. This is formatted as a JSON string. Maximum length of 5120 characters. PolicyDocument pulumi.Input - // Name of the resource policy. + // Name of the resource policy. Exactly one of `policyName` or `resourceArn` must be specified and this argument is required for account-scoped policies. Note that the number of resource policies without `resourceArn` is limited to 10 per region. PolicyName pulumi.StringPtrInput + // Scope of the resource policy (`ACCOUNT` or `RESOURCE`). + PolicyScope pulumi.StringPtrInput // Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the provider configuration. Region pulumi.StringPtrInput + // ARN of the CloudWatch Logs resource to which the resource policy is attached. Exactly one of `policyName` or `resourceArn` must be specified and this argument is required for resource-scoped policies. Only one policy can be attached per log group resource ARN. + ResourceArn pulumi.StringPtrInput + // Revision ID of the resource policy. Only populated for resource-scoped policies. + RevisionId pulumi.StringPtrInput } func (LogResourcePolicyState) ElementType() reflect.Type { @@ -199,20 +218,24 @@ func (LogResourcePolicyState) ElementType() reflect.Type { type logResourcePolicyArgs struct { // Details of the resource policy, including the identity of the principal that is enabled to put logs to this account. This is formatted as a JSON string. Maximum length of 5120 characters. PolicyDocument interface{} `pulumi:"policyDocument"` - // Name of the resource policy. - PolicyName string `pulumi:"policyName"` + // Name of the resource policy. Exactly one of `policyName` or `resourceArn` must be specified and this argument is required for account-scoped policies. Note that the number of resource policies without `resourceArn` is limited to 10 per region. + PolicyName *string `pulumi:"policyName"` // Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the provider configuration. Region *string `pulumi:"region"` + // ARN of the CloudWatch Logs resource to which the resource policy is attached. Exactly one of `policyName` or `resourceArn` must be specified and this argument is required for resource-scoped policies. Only one policy can be attached per log group resource ARN. + ResourceArn *string `pulumi:"resourceArn"` } // The set of arguments for constructing a LogResourcePolicy resource. type LogResourcePolicyArgs struct { // Details of the resource policy, including the identity of the principal that is enabled to put logs to this account. This is formatted as a JSON string. Maximum length of 5120 characters. PolicyDocument pulumi.Input - // Name of the resource policy. - PolicyName pulumi.StringInput + // Name of the resource policy. Exactly one of `policyName` or `resourceArn` must be specified and this argument is required for account-scoped policies. Note that the number of resource policies without `resourceArn` is limited to 10 per region. + PolicyName pulumi.StringPtrInput // Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the provider configuration. Region pulumi.StringPtrInput + // ARN of the CloudWatch Logs resource to which the resource policy is attached. Exactly one of `policyName` or `resourceArn` must be specified and this argument is required for resource-scoped policies. Only one policy can be attached per log group resource ARN. + ResourceArn pulumi.StringPtrInput } func (LogResourcePolicyArgs) ElementType() reflect.Type { @@ -307,9 +330,14 @@ func (o LogResourcePolicyOutput) PolicyDocument() pulumi.StringOutput { return o.ApplyT(func(v *LogResourcePolicy) pulumi.StringOutput { return v.PolicyDocument }).(pulumi.StringOutput) } -// Name of the resource policy. -func (o LogResourcePolicyOutput) PolicyName() pulumi.StringOutput { - return o.ApplyT(func(v *LogResourcePolicy) pulumi.StringOutput { return v.PolicyName }).(pulumi.StringOutput) +// Name of the resource policy. Exactly one of `policyName` or `resourceArn` must be specified and this argument is required for account-scoped policies. Note that the number of resource policies without `resourceArn` is limited to 10 per region. +func (o LogResourcePolicyOutput) PolicyName() pulumi.StringPtrOutput { + return o.ApplyT(func(v *LogResourcePolicy) pulumi.StringPtrOutput { return v.PolicyName }).(pulumi.StringPtrOutput) +} + +// Scope of the resource policy (`ACCOUNT` or `RESOURCE`). +func (o LogResourcePolicyOutput) PolicyScope() pulumi.StringOutput { + return o.ApplyT(func(v *LogResourcePolicy) pulumi.StringOutput { return v.PolicyScope }).(pulumi.StringOutput) } // Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the provider configuration. @@ -317,6 +345,16 @@ func (o LogResourcePolicyOutput) Region() pulumi.StringOutput { return o.ApplyT(func(v *LogResourcePolicy) pulumi.StringOutput { return v.Region }).(pulumi.StringOutput) } +// ARN of the CloudWatch Logs resource to which the resource policy is attached. Exactly one of `policyName` or `resourceArn` must be specified and this argument is required for resource-scoped policies. Only one policy can be attached per log group resource ARN. +func (o LogResourcePolicyOutput) ResourceArn() pulumi.StringPtrOutput { + return o.ApplyT(func(v *LogResourcePolicy) pulumi.StringPtrOutput { return v.ResourceArn }).(pulumi.StringPtrOutput) +} + +// Revision ID of the resource policy. Only populated for resource-scoped policies. +func (o LogResourcePolicyOutput) RevisionId() pulumi.StringOutput { + return o.ApplyT(func(v *LogResourcePolicy) pulumi.StringOutput { return v.RevisionId }).(pulumi.StringOutput) +} + type LogResourcePolicyArrayOutput struct{ *pulumi.OutputState } func (LogResourcePolicyArrayOutput) ElementType() reflect.Type { diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v7/go/aws/ec2/vpcEndpoint.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v7/go/aws/ec2/vpcEndpoint.go index e2b6d2351..ca9e37126 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v7/go/aws/ec2/vpcEndpoint.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v7/go/aws/ec2/vpcEndpoint.go @@ -397,7 +397,7 @@ type VpcEndpoint struct { // The prefix list ID of the exposed AWS service. Applicable for endpoints of type `Gateway`. PrefixListId pulumi.StringOutput `pulumi:"prefixListId"` // Whether or not to associate a private hosted zone with the specified VPC. Applicable for endpoints of type `Interface`. Most users will want this enabled to allow services within the VPC to automatically use the endpoint. - // Defaults to `false`. + // Defaults to `false`. If `vpcEndpointType` is anything other than `Interface`, changing this value forces a new resource to be created. PrivateDnsEnabled pulumi.BoolOutput `pulumi:"privateDnsEnabled"` // Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the provider configuration. Region pulumi.StringOutput `pulumi:"region"` @@ -486,7 +486,7 @@ type vpcEndpointState struct { // The prefix list ID of the exposed AWS service. Applicable for endpoints of type `Gateway`. PrefixListId *string `pulumi:"prefixListId"` // Whether or not to associate a private hosted zone with the specified VPC. Applicable for endpoints of type `Interface`. Most users will want this enabled to allow services within the VPC to automatically use the endpoint. - // Defaults to `false`. + // Defaults to `false`. If `vpcEndpointType` is anything other than `Interface`, changing this value forces a new resource to be created. PrivateDnsEnabled *bool `pulumi:"privateDnsEnabled"` // Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the provider configuration. Region *string `pulumi:"region"` @@ -543,7 +543,7 @@ type VpcEndpointState struct { // The prefix list ID of the exposed AWS service. Applicable for endpoints of type `Gateway`. PrefixListId pulumi.StringPtrInput // Whether or not to associate a private hosted zone with the specified VPC. Applicable for endpoints of type `Interface`. Most users will want this enabled to allow services within the VPC to automatically use the endpoint. - // Defaults to `false`. + // Defaults to `false`. If `vpcEndpointType` is anything other than `Interface`, changing this value forces a new resource to be created. PrivateDnsEnabled pulumi.BoolPtrInput // Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the provider configuration. Region pulumi.StringPtrInput @@ -592,7 +592,7 @@ type vpcEndpointArgs struct { // A policy to attach to the endpoint that controls access to the service. This is a JSON formatted string. Defaults to full access. All `Gateway` and some `Interface` endpoints support policies - see the [relevant AWS documentation](https://docs.aws.amazon.com/vpc/latest/userguide/vpc-endpoints-access.html) for more details. Policy *string `pulumi:"policy"` // Whether or not to associate a private hosted zone with the specified VPC. Applicable for endpoints of type `Interface`. Most users will want this enabled to allow services within the VPC to automatically use the endpoint. - // Defaults to `false`. + // Defaults to `false`. If `vpcEndpointType` is anything other than `Interface`, changing this value forces a new resource to be created. PrivateDnsEnabled *bool `pulumi:"privateDnsEnabled"` // Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the provider configuration. Region *string `pulumi:"region"` @@ -632,7 +632,7 @@ type VpcEndpointArgs struct { // A policy to attach to the endpoint that controls access to the service. This is a JSON formatted string. Defaults to full access. All `Gateway` and some `Interface` endpoints support policies - see the [relevant AWS documentation](https://docs.aws.amazon.com/vpc/latest/userguide/vpc-endpoints-access.html) for more details. Policy pulumi.StringPtrInput // Whether or not to associate a private hosted zone with the specified VPC. Applicable for endpoints of type `Interface`. Most users will want this enabled to allow services within the VPC to automatically use the endpoint. - // Defaults to `false`. + // Defaults to `false`. If `vpcEndpointType` is anything other than `Interface`, changing this value forces a new resource to be created. PrivateDnsEnabled pulumi.BoolPtrInput // Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the provider configuration. Region pulumi.StringPtrInput @@ -799,7 +799,7 @@ func (o VpcEndpointOutput) PrefixListId() pulumi.StringOutput { } // Whether or not to associate a private hosted zone with the specified VPC. Applicable for endpoints of type `Interface`. Most users will want this enabled to allow services within the VPC to automatically use the endpoint. -// Defaults to `false`. +// Defaults to `false`. If `vpcEndpointType` is anything other than `Interface`, changing this value forces a new resource to be created. func (o VpcEndpointOutput) PrivateDnsEnabled() pulumi.BoolOutput { return o.ApplyT(func(v *VpcEndpoint) pulumi.BoolOutput { return v.PrivateDnsEnabled }).(pulumi.BoolOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v7/go/aws/iam/getOutboundWebIdentityFederation.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v7/go/aws/iam/getOutboundWebIdentityFederation.go new file mode 100644 index 000000000..60d09f571 --- /dev/null +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v7/go/aws/iam/getOutboundWebIdentityFederation.go @@ -0,0 +1,91 @@ +// Code generated by pulumi-language-go DO NOT EDIT. +// *** WARNING: Do not edit by hand unless you're certain you know what you are doing! *** + +package iam + +import ( + "context" + "reflect" + + "github.com/pulumi/pulumi-aws/sdk/v7/go/aws/internal" + "github.com/pulumi/pulumi/sdk/v3/go/pulumi" +) + +// Use this data source to retrieve information about an AWS IAM (Identity & Access Management) Outbound Web Identity Federation. +// +// ## Example Usage +// +// ```go +// package main +// +// import ( +// +// "github.com/pulumi/pulumi-aws/sdk/v7/go/aws/iam" +// "github.com/pulumi/pulumi/sdk/v3/go/pulumi" +// +// ) +// +// func main() { +// pulumi.Run(func(ctx *pulumi.Context) error { +// _, err := iam.LookupOutboundWebIdentityFederation(ctx, map[string]interface{}{}, nil) +// if err != nil { +// return err +// } +// return nil +// }) +// } +// +// ``` +func LookupOutboundWebIdentityFederation(ctx *pulumi.Context, opts ...pulumi.InvokeOption) (*LookupOutboundWebIdentityFederationResult, error) { + opts = internal.PkgInvokeDefaultOpts(opts) + var rv LookupOutboundWebIdentityFederationResult + err := ctx.Invoke("aws:iam/getOutboundWebIdentityFederation:getOutboundWebIdentityFederation", nil, &rv, opts...) + if err != nil { + return nil, err + } + return &rv, nil +} + +// A collection of values returned by getOutboundWebIdentityFederation. +type LookupOutboundWebIdentityFederationResult struct { + // The provider-assigned unique ID for this managed resource. + Id string `pulumi:"id"` + // A unique issuer URL for your AWS account that hosts the OpenID Connect (OIDC) discovery endpoints. + IssuerIdentifier string `pulumi:"issuerIdentifier"` +} + +func LookupOutboundWebIdentityFederationOutput(ctx *pulumi.Context, opts ...pulumi.InvokeOption) LookupOutboundWebIdentityFederationResultOutput { + return pulumi.ToOutput(0).ApplyT(func(int) (LookupOutboundWebIdentityFederationResultOutput, error) { + options := pulumi.InvokeOutputOptions{InvokeOptions: internal.PkgInvokeDefaultOpts(opts)} + return ctx.InvokeOutput("aws:iam/getOutboundWebIdentityFederation:getOutboundWebIdentityFederation", nil, LookupOutboundWebIdentityFederationResultOutput{}, options).(LookupOutboundWebIdentityFederationResultOutput), nil + }).(LookupOutboundWebIdentityFederationResultOutput) +} + +// A collection of values returned by getOutboundWebIdentityFederation. +type LookupOutboundWebIdentityFederationResultOutput struct{ *pulumi.OutputState } + +func (LookupOutboundWebIdentityFederationResultOutput) ElementType() reflect.Type { + return reflect.TypeOf((*LookupOutboundWebIdentityFederationResult)(nil)).Elem() +} + +func (o LookupOutboundWebIdentityFederationResultOutput) ToLookupOutboundWebIdentityFederationResultOutput() LookupOutboundWebIdentityFederationResultOutput { + return o +} + +func (o LookupOutboundWebIdentityFederationResultOutput) ToLookupOutboundWebIdentityFederationResultOutputWithContext(ctx context.Context) LookupOutboundWebIdentityFederationResultOutput { + return o +} + +// The provider-assigned unique ID for this managed resource. +func (o LookupOutboundWebIdentityFederationResultOutput) Id() pulumi.StringOutput { + return o.ApplyT(func(v LookupOutboundWebIdentityFederationResult) string { return v.Id }).(pulumi.StringOutput) +} + +// A unique issuer URL for your AWS account that hosts the OpenID Connect (OIDC) discovery endpoints. +func (o LookupOutboundWebIdentityFederationResultOutput) IssuerIdentifier() pulumi.StringOutput { + return o.ApplyT(func(v LookupOutboundWebIdentityFederationResult) string { return v.IssuerIdentifier }).(pulumi.StringOutput) +} + +func init() { + pulumi.RegisterOutputType(LookupOutboundWebIdentityFederationResultOutput{}) +} diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v7/go/aws/internal/pulumiUtilities.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v7/go/aws/internal/pulumiUtilities.go index 99a509eee..82c49cc1a 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v7/go/aws/internal/pulumiUtilities.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v7/go/aws/internal/pulumiUtilities.go @@ -165,7 +165,7 @@ func callPlainInner( func PkgResourceDefaultOpts(opts []pulumi.ResourceOption) []pulumi.ResourceOption { defaults := []pulumi.ResourceOption{} - version := semver.MustParse("7.21.0") + version := semver.MustParse("7.23.0") if !version.Equals(semver.Version{}) { defaults = append(defaults, pulumi.Version(version.String())) } @@ -176,7 +176,7 @@ func PkgResourceDefaultOpts(opts []pulumi.ResourceOption) []pulumi.ResourceOptio func PkgInvokeDefaultOpts(opts []pulumi.InvokeOption) []pulumi.InvokeOption { defaults := []pulumi.InvokeOption{} - version := semver.MustParse("7.21.0") + version := semver.MustParse("7.23.0") if !version.Equals(semver.Version{}) { defaults = append(defaults, pulumi.Version(version.String())) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v7/go/aws/pulumi-plugin.json b/vendor/github.com/pulumi/pulumi-aws/sdk/v7/go/aws/pulumi-plugin.json index 90c2c2494..71764feb2 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v7/go/aws/pulumi-plugin.json +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v7/go/aws/pulumi-plugin.json @@ -1,5 +1,5 @@ { "resource": true, "name": "aws", - "version": "7.21.0" + "version": "7.23.0" } diff --git a/vendor/github.com/pulumi/pulumi-kubernetes/sdk/v4/go/kubernetes/pulumi-plugin.json b/vendor/github.com/pulumi/pulumi-kubernetes/sdk/v4/go/kubernetes/pulumi-plugin.json index eb3efadc4..ceba26865 100644 --- a/vendor/github.com/pulumi/pulumi-kubernetes/sdk/v4/go/kubernetes/pulumi-plugin.json +++ b/vendor/github.com/pulumi/pulumi-kubernetes/sdk/v4/go/kubernetes/pulumi-plugin.json @@ -1,5 +1,5 @@ { "resource": true, "name": "kubernetes", - "version": "4.27.0" + "version": "4.28.0" } diff --git a/vendor/github.com/pulumi/pulumi-kubernetes/sdk/v4/go/kubernetes/utilities/pulumiUtilities.go b/vendor/github.com/pulumi/pulumi-kubernetes/sdk/v4/go/kubernetes/utilities/pulumiUtilities.go index 0eb56734b..6b35cc8c9 100644 --- a/vendor/github.com/pulumi/pulumi-kubernetes/sdk/v4/go/kubernetes/utilities/pulumiUtilities.go +++ b/vendor/github.com/pulumi/pulumi-kubernetes/sdk/v4/go/kubernetes/utilities/pulumiUtilities.go @@ -165,7 +165,7 @@ func callPlainInner( func PkgResourceDefaultOpts(opts []pulumi.ResourceOption) []pulumi.ResourceOption { defaults := []pulumi.ResourceOption{} - version := semver.MustParse("4.27.0") + version := semver.MustParse("4.28.0") if !version.Equals(semver.Version{}) { defaults = append(defaults, pulumi.Version(version.String())) } @@ -176,7 +176,7 @@ func PkgResourceDefaultOpts(opts []pulumi.ResourceOption) []pulumi.ResourceOptio func PkgInvokeDefaultOpts(opts []pulumi.InvokeOption) []pulumi.InvokeOption { defaults := []pulumi.InvokeOption{} - version := semver.MustParse("4.27.0") + version := semver.MustParse("4.28.0") if !version.Equals(semver.Version{}) { defaults = append(defaults, pulumi.Version(version.String())) } diff --git a/vendor/github.com/pulumi/pulumi/sdk/v3/.version b/vendor/github.com/pulumi/pulumi/sdk/v3/.version index 16d973730..7f9d358bd 100644 --- a/vendor/github.com/pulumi/pulumi/sdk/v3/.version +++ b/vendor/github.com/pulumi/pulumi/sdk/v3/.version @@ -1 +1 @@ -3.225.1 +3.226.0 diff --git a/vendor/github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin/plugin.go b/vendor/github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin/plugin.go index 21309d8f8..d65c69b8e 100644 --- a/vendor/github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin/plugin.go +++ b/vendor/github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin/plugin.go @@ -472,7 +472,7 @@ func ExecPlugin(ctx *Context, bin, prefix string, kind apitype.PluginKind, } if otelEndpoint := cmdutil.OTelEndpoint(); otelEndpoint != "" { - environment = append(environment, "OTEL_EXPORTER_OTLP_ENDPOINT="+otelEndpoint) + environment = append(environment, "PULUMI_OTEL_EXPORTER_OTLP_ENDPOINT="+otelEndpoint) } // Check to see if we have a binary we can invoke directly diff --git a/vendor/github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil/exit.go b/vendor/github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil/exit.go index e58cfacc2..ba8c58c00 100644 --- a/vendor/github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil/exit.go +++ b/vendor/github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil/exit.go @@ -20,7 +20,7 @@ import ( "strings" "github.com/hashicorp/go-multierror" - "github.com/pkg/errors" + pkgerrors "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/pulumi/pulumi/sdk/v3/go/common/diag" @@ -38,7 +38,7 @@ func DetailedError(err error) string { for { if stackerr, ok := err.(interface { - StackTrace() errors.StackTrace + StackTrace() pkgerrors.StackTrace }); ok { msg.WriteString("\n") if hasstack { @@ -52,7 +52,7 @@ func DetailedError(err error) string { } // Keep going up the causer chain, if any. - cause := errors.Cause(err) + cause := pkgerrors.Cause(err) if cause == err || cause == nil { break } @@ -115,9 +115,26 @@ func Exit(err error) { // ExitError issues an error and exits with a standard error exit code. func ExitError(msg string) { Diag().Errorf(diag.Message("", "%s"), msg) - os.Exit(-1) + os.Exit(ExitCodeError) } +// Exit code taxonomy for the Pulumi CLI. These values form part of the +// contract for automation and agent integrations and must be treated as +// stable once released. +const ( + ExitSuccess = 0 + ExitCodeError = 1 // generic/unclassified error + ExitConfigurationError = 2 // invalid flags, config, or invocation + ExitAuthenticationError = 3 + ExitResourceError = 4 + ExitPolicyViolation = 5 + ExitStackNotFound = 6 + ExitNoChanges = 7 + ExitCancelled = 8 + ExitTimeout = 9 + ExitInternalError = 255 +) + // errorMessage returns a message, possibly cleaning up the text if appropriate. func errorMessage(err error) string { contract.Requiref(err != nil, "err", "must not be nil") diff --git a/vendor/github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil/trace.go b/vendor/github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil/trace.go index 1d8ff4c3b..c160f9668 100644 --- a/vendor/github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil/trace.go +++ b/vendor/github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil/trace.go @@ -70,6 +70,7 @@ var otelEndpoint string var ( otelReceiver *otelreceiver.Receiver otelTracerProvider *sdktrace.TracerProvider + appdashBridge *otelreceiver.AppDashBridge ) type localStore struct { @@ -195,7 +196,9 @@ func CloseTracing() { TracingRootSpan.Finish() } - contract.IgnoreClose(traceCloser) + if traceCloser != nil { + contract.IgnoreClose(traceCloser) + } } // IsOTelEnabled returns true if OTEL is enabled via environment variable or endpoint is set. @@ -231,12 +234,33 @@ func InitOtelReceiver(endpoint string) error { ep := receiver.Endpoint() + // Start the AppDash bridge so that legacy OpenTracing plugins can send + // spans that get converted to OTLP and forwarded to the same exporter. + bridge, err := otelreceiver.StartAppDashBridge(exporter) + if err != nil { + _ = receiver.Shutdown(context.Background()) + _ = exporter.Shutdown(context.Background()) + return fmt.Errorf("failed to start AppDash bridge: %w", err) + } + otelMu.Lock() otelReceiver = receiver otelEndpoint = ep + appdashBridge = bridge otelMu.Unlock() + // Set TracingEndpoint to the AppDash bridge so legacy plugins + // (providers that only speak OpenTracing) send their spans through + // it. We intentionally do NOT call InitTracing() here: the CLI + // uses OTel for its own spans and does not need an OpenTracing + // tracer. Keeping the global tracer as a no-op avoids duplicate + // spans on the engine's gRPC server interceptors while still + // letting provider plugins connect via --tracing. Root provider + // spans are grafted onto the OTel trace via SetTraceParent(). + TracingEndpoint = bridge.Endpoint() + logging.V(5).Infof("Started local OTLP receiver at %s with exporter for %s", ep, endpoint) + logging.V(5).Infof("Started AppDash bridge at %s for legacy OpenTracing plugins", bridge.Endpoint()) // Set up Otel TracerProvider for CLI's own spans // The CLI sends its spans to the local receiver, which forwards to the configured exporter @@ -288,6 +312,20 @@ func InitOtelTracing(serviceName, endpoint string) error { return nil } +// SetAppDashTraceParent tells the AppDash bridge to remap all incoming +// AppDash trace IDs to the given OTel trace ID, and to parent root AppDash +// spans under the given OTel span ID. This grafts legacy OpenTracing spans +// onto the CLI's native OTel trace. +func SetAppDashTraceParent(traceID [16]byte, spanID [8]byte) { + otelMu.RLock() + b := appdashBridge + otelMu.RUnlock() + + if b != nil { + b.SetTraceParent(traceID, spanID) + } +} + func CloseOtelTracing() { ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second) defer cancel() @@ -297,6 +335,8 @@ func CloseOtelTracing() { otelTracerProvider = nil recv := otelReceiver otelReceiver = nil + bridge := appdashBridge + appdashBridge = nil otelEndpoint = "" otelMu.Unlock() @@ -306,6 +346,12 @@ func CloseOtelTracing() { } } + if bridge != nil { + if err := bridge.Shutdown(ctx); err != nil { + logging.V(3).Infof("error closing AppDash bridge: %v", err) + } + } + if recv != nil { if err := recv.Shutdown(ctx); err != nil { logging.V(3).Infof("error closing OTLP receiver: %v", err) diff --git a/vendor/github.com/pulumi/pulumi/sdk/v3/go/common/util/otelreceiver/appdash_bridge.go b/vendor/github.com/pulumi/pulumi/sdk/v3/go/common/util/otelreceiver/appdash_bridge.go new file mode 100644 index 000000000..5f65e008e --- /dev/null +++ b/vendor/github.com/pulumi/pulumi/sdk/v3/go/common/util/otelreceiver/appdash_bridge.go @@ -0,0 +1,289 @@ +// Copyright 2026, Pulumi Corporation. +// +// 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. + +package otelreceiver + +import ( + "context" + "encoding/binary" + "fmt" + "io" + "log" + "net" + "strings" + "sync" + "time" + + "github.com/pulumi/appdash" + "github.com/pulumi/pulumi/sdk/v3/go/common/util/logging" + commonpb "go.opentelemetry.io/proto/otlp/common/v1" + resourcepb "go.opentelemetry.io/proto/otlp/resource/v1" + tracepb "go.opentelemetry.io/proto/otlp/trace/v1" +) + +// AppDashBridge receives spans via the AppDash TCP protocol (used by legacy +// OpenTracing plugins) and converts them to otel ResourceSpans, forwarding +// them to a SpanExporter. +type AppDashBridge struct { + server *appdash.CollectorServer + listener *net.TCPListener + port int + exporter SpanExporter + collector *bridgeCollector +} + +// StartAppDashBridge creates and starts an AppDash TCP server that bridges +// legacy OpenTracing spans to otel. +func StartAppDashBridge(exporter SpanExporter) (*AppDashBridge, error) { + listener, err := net.ListenTCP("tcp", &net.TCPAddr{IP: net.IPv4(127, 0, 0, 1), Port: 0}) + if err != nil { + return nil, fmt.Errorf("failed to listen for AppDash bridge: %w", err) + } + + port := listener.Addr().(*net.TCPAddr).Port + + collector := &bridgeCollector{ + exporter: exporter, + pending: make(map[appdash.SpanID][]appdash.Annotation), + } + + server := appdash.NewServer(listener, collector) + // Suppress the noisy Accept-error log loop on shutdown. + server.Log = log.New(io.Discard, "", 0) + + b := &AppDashBridge{ + server: server, + listener: listener, + port: port, + exporter: exporter, + collector: collector, + } + + go server.Start() + + logging.V(5).Infof("AppDash bridge started on port %d", port) + + return b, nil +} + +// Endpoint returns the AppDash TCP endpoint in the format expected by +// legacy plugins (tcp://127.0.0.1:PORT). +func (b *AppDashBridge) Endpoint() string { + return fmt.Sprintf("tcp://127.0.0.1:%d", b.port) +} + +// SetTraceParent tells the bridge to remap all AppDash trace IDs to the +// given OTel trace ID, and to parent root AppDash spans (those without an +// AppDash parent) under the given OTel span ID. This puts bridged spans +// into the same trace as the CLI's native OTel spans. +func (b *AppDashBridge) SetTraceParent(traceID [16]byte, spanID [8]byte) { + b.collector.mu.Lock() + defer b.collector.mu.Unlock() + b.collector.otelTraceID = traceID + b.collector.otelParentSpanID = spanID +} + +func (b *AppDashBridge) Shutdown(_ context.Context) error { + return b.listener.Close() +} + +// bridgeCollector implements appdash.Collector. It accumulates annotations +// per SpanID across multiple Collect calls. The appdash_opentracing recorder +// makes several Collect calls for a single span (name, tags, timespan). +// The Timespan event (_schema:Timespan) is always sent last, so we use it +// as the trigger to flush the accumulated span to OTLP. +type bridgeCollector struct { + mu sync.Mutex + exporter SpanExporter + pending map[appdash.SpanID][]appdash.Annotation + otelTraceID [16]byte // if non-zero, replaces AppDash trace IDs + otelParentSpanID [8]byte // parent for root AppDash spans +} + +func (c *bridgeCollector) Collect(id appdash.SpanID, anns ...appdash.Annotation) error { + c.mu.Lock() + defer c.mu.Unlock() + + c.pending[id] = append(c.pending[id], anns...) + + // Check if this batch contains the Timespan schema marker, which + // indicates the recorder has finished sending all annotations for + // this span. + hasTimespan := false + for _, ann := range anns { + if ann.Key == "_schema:Timespan" { + hasTimespan = true + break + } + } + + if !hasTimespan { + return nil + } + + allAnns := c.pending[id] + delete(c.pending, id) + otelTraceID := c.otelTraceID + otelParentSpanID := c.otelParentSpanID + + resourceSpans := convertAppDashToOTLP(id, allAnns, otelTraceID, otelParentSpanID) + if resourceSpans == nil { + return nil + } + + if err := c.exporter.ExportSpans(context.Background(), []*tracepb.ResourceSpans{resourceSpans}); err != nil { + logging.V(5).Infof("AppDash bridge: failed to export span: %v", err) + return err + } + + return nil +} + +// inferServiceName guesses a service name from the span name. gRPC server +// interceptor spans look like "/pulumirpc.ResourceProvider/Check" while +// Pulumi-framework spans look like "pf.Configure". +func inferServiceName(spanName string) string { + switch { + case strings.Contains(spanName, "ResourceProvider"): + return "pulumi-resource-provider" + case strings.HasPrefix(spanName, "pf."): + return "pulumi-resource-provider" + case strings.Contains(spanName, "LanguageRuntime"): + return "pulumi-language-host" + case strings.Contains(spanName, "ResourceMonitor"), + strings.Contains(spanName, "Engine/"): + // Calls made by the language host to the engine/monitor + return "pulumi-language-host" + default: + return "opentracing-plugin" + } +} + +// convertAppDashToOTLP converts an AppDash span (identified by SpanID and +// accumulated annotations) into OTLP ResourceSpans. If otelTraceID is +// non-zero the AppDash trace ID is replaced so that bridged spans appear in +// the same trace as the CLI's native OTel spans. Root AppDash spans (no +// AppDash parent) are parented under otelParentSpanID. +func convertAppDashToOTLP( + id appdash.SpanID, anns []appdash.Annotation, + otelTraceID [16]byte, otelParentSpanID [8]byte, +) *tracepb.ResourceSpans { + var name string + var serviceName string + var startTime, endTime time.Time + var hasError bool + var attributes []*commonpb.KeyValue + + for _, ann := range anns { + switch { + case ann.Key == "Name": + name = string(ann.Value) + case ann.Key == "ServerName": + serviceName = string(ann.Value) + case ann.Key == "Span.Start": + if t, err := time.Parse(time.RFC3339Nano, string(ann.Value)); err == nil { + startTime = t + } + case ann.Key == "Span.End": + if t, err := time.Parse(time.RFC3339Nano, string(ann.Value)); err == nil { + endTime = t + } + case ann.Key == "error": + if string(ann.Value) == "true" { + hasError = true + } + case strings.HasPrefix(ann.Key, "_schema:"): + // Schema markers — skip. + default: + attributes = append(attributes, &commonpb.KeyValue{ + Key: ann.Key, + Value: &commonpb.AnyValue{ + Value: &commonpb.AnyValue_StringValue{StringValue: string(ann.Value)}, + }, + }) + } + } + + if name == "" { + name = fmt.Sprintf("span-%d", id.Span) + } + + // Build trace ID. If an OTel trace ID override is set, use it so that + // bridged spans land in the same trace as native OTel spans. Otherwise + // map the AppDash uint64 trace ID into the low 8 bytes of a 16-byte ID. + var zeroTraceID [16]byte + var traceID [16]byte + if otelTraceID != zeroTraceID { + traceID = otelTraceID + } else { + binary.BigEndian.PutUint64(traceID[8:], uint64(id.Trace)) + } + + var spanID [8]byte + binary.BigEndian.PutUint64(spanID[:], uint64(id.Span)) + + span := &tracepb.Span{ + TraceId: traceID[:], + SpanId: spanID[:], + Name: name, + Attributes: attributes, + } + + // Set parent span ID. If the AppDash span has a parent, keep it. + // Otherwise, if an OTel parent override is set, use it to graft the + // root of the AppDash tree onto the OTel trace. + var zeroSpanID [8]byte + if id.Parent != 0 { + var parentSpanID [8]byte + binary.BigEndian.PutUint64(parentSpanID[:], uint64(id.Parent)) + span.ParentSpanId = parentSpanID[:] + } else if otelParentSpanID != zeroSpanID { + span.ParentSpanId = otelParentSpanID[:] + } + + if hasError { + span.Status = &tracepb.Status{ + Code: tracepb.Status_STATUS_CODE_ERROR, + } + } + + if !startTime.IsZero() { + span.StartTimeUnixNano = uint64(startTime.UnixNano()) //nolint:gosec // timestamps are always positive + } + if !endTime.IsZero() { + span.EndTimeUnixNano = uint64(endTime.UnixNano()) //nolint:gosec // timestamps are always positive + } + + if serviceName == "" { + serviceName = inferServiceName(name) + } + + return &tracepb.ResourceSpans{ + Resource: &resourcepb.Resource{ + Attributes: []*commonpb.KeyValue{ + { + Key: "service.name", + Value: &commonpb.AnyValue{ + Value: &commonpb.AnyValue_StringValue{StringValue: serviceName}, + }, + }, + }, + }, + ScopeSpans: []*tracepb.ScopeSpans{ + { + Spans: []*tracepb.Span{span}, + }, + }, + } +} diff --git a/vendor/github.com/pulumi/pulumi/sdk/v3/go/common/workspace/plugins.go b/vendor/github.com/pulumi/pulumi/sdk/v3/go/common/workspace/plugins.go index b3879d81e..306d4fe41 100644 --- a/vendor/github.com/pulumi/pulumi/sdk/v3/go/common/workspace/plugins.go +++ b/vendor/github.com/pulumi/pulumi/sdk/v3/go/common/workspace/plugins.go @@ -1080,11 +1080,14 @@ type PluginDescriptor struct { type PluginVersionNotFoundError error var urlRegex = sync.OnceValue(func() *regexp.Regexp { - return regexp.MustCompile(`^[^\./].*\.[a-z]+/[a-zA-Z0-9-_/]*[a-zA-Z0-9/](@.*)?$`) + return regexp.MustCompile(`^[^\./].*\.[a-z]+/[a-zA-Z0-9-_\./]*[a-zA-Z0-9/](@.*)?$`) }) func IsExternalURL(source string) bool { - return strings.HasPrefix(source, "https://") || strings.HasPrefix(source, "git://") || urlRegex().MatchString(source) + return strings.HasPrefix(source, "https://") || + strings.HasPrefix(source, "http://") || + strings.HasPrefix(source, "git://") || + urlRegex().MatchString(source) } // Allow sha1 and sha256 hashes. diff --git a/vendor/github.com/pulumi/pulumi/sdk/v3/go/pulumi/instrumentation.go b/vendor/github.com/pulumi/pulumi/sdk/v3/go/pulumi/instrumentation.go index 15e1d32d0..b52d62f7f 100644 --- a/vendor/github.com/pulumi/pulumi/sdk/v3/go/pulumi/instrumentation.go +++ b/vendor/github.com/pulumi/pulumi/sdk/v3/go/pulumi/instrumentation.go @@ -32,7 +32,7 @@ import ( var tracerProvider *sdktrace.TracerProvider // initTracing initializes OpenTelemetry tracing when TRACEPARENT and -// OTEL_EXPORTER_OTLP_ENDPOINT environment variables are present. +// PULUMI_OTEL_EXPORTER_OTLP_ENDPOINT environment variables are present. // Returns a context with the extracted trace parent. func initTracing(ctx context.Context) context.Context { traceparent := os.Getenv("TRACEPARENT") @@ -40,7 +40,7 @@ func initTracing(ctx context.Context) context.Context { return ctx } - otlpEndpoint := os.Getenv("OTEL_EXPORTER_OTLP_ENDPOINT") + otlpEndpoint := os.Getenv("PULUMI_OTEL_EXPORTER_OTLP_ENDPOINT") if otlpEndpoint == "" { return ctx } diff --git a/vendor/go.opentelemetry.io/collector/featuregate/README.md b/vendor/go.opentelemetry.io/collector/featuregate/README.md index d3e3c802d..12f8ebf85 100644 --- a/vendor/go.opentelemetry.io/collector/featuregate/README.md +++ b/vendor/go.opentelemetry.io/collector/featuregate/README.md @@ -8,9 +8,36 @@ based on flags at the component level. ## Usage -Feature gates must be defined and registered with the global registry in -an `init()` function. This makes the `Gate` available to be configured and -queried with the defined [`Stage`](#feature-lifecycle) default value. +### With mdatagen + +In components that use mdatagen, feature gates should be defined in the +component's `metadata.yml`. + +```yaml +feature_gates: + - id: namespaced.uniqueIdentifier + description: A brief description of what the gate controls + stage: stable + from_version: 'v0.65.0' + reference_url: 'https://github.com/open-telemetry/opentelemetry-collector/issues/6167' +``` + +Running the mdatagen code generator with this configuration will initialize the +feature flag in the `internal/metadata` submodule. +The status of the gate can later be checked by calling that submodule: + +```go +if metadata.NamespacedUniqueIdentifierFeatureGate.IsEnabled() { + setupNewFeature() +} +``` + +### In code + +In components that don't use mdatagen, feature gates can be defined and +registered with the global registry in an `init()` function. This makes the +`Gate` available to be configured and queried with the defined +[`Stage`](#feature-lifecycle) default value. A `Gate` can have a list of associated issues that allow users to refer to the issue and report any additional problems or understand the context of the `Gate`. Once a `Gate` has been marked as `Stable`, it must have a `RemovalVersion` set. @@ -25,7 +52,7 @@ var myFeatureGate = featuregate.GlobalRegistry().MustRegister( featuregate.WithRegisterToVersion("v0.70.0")) ``` -The status of the gate may later be checked by interrogating the global +The status of the gate may later be checked by interrogating the global feature gate registry: ```go @@ -34,14 +61,14 @@ if myFeatureGate.IsEnabled() { } ``` -Note that querying the registry takes a read lock and accesses a map, so it -should be done once and the result cached for local use if repeated checks +Note that querying the registry takes a read lock and accesses a map, so it +should be done once and the result cached for local use if repeated checks are required. Avoid querying the registry in a loop. ## Controlling Gates -Feature gates can be enabled or disabled via the CLI, with the -`--feature-gates` flag. When using the CLI flag, gate +Feature gates can be enabled or disabled via the CLI, with the +`--feature-gates` flag. When using the CLI flag, gate identifiers must be presented as a comma-delimited list. Gate identifiers prefixed with `-` will disable the gate and prefixing with `+` or with no prefix will enable the gate. @@ -54,19 +81,19 @@ This will enable `gate1` and `gate3` and disable `gate2`. ## Feature Lifecycle -Features controlled by a `Gate` should follow a three-stage lifecycle, +Features controlled by a `Gate` should follow a three-stage lifecycle, modeled after the [system used by Kubernetes](https://kubernetes.io/docs/reference/command-line-tools-reference/feature-gates/#feature-stages): -1. An `alpha` stage where the feature is disabled by default and must be enabled +1. An `alpha` stage where the feature is disabled by default and must be enabled through a `Gate`. -2. A `beta` stage where the feature has been well tested and is enabled by +2. A `beta` stage where the feature has been well tested and is enabled by default but can be disabled through a `Gate`. 3. A generally available or `stable` stage where the feature is permanently enabled. At this stage the gate should no longer be explicitly used. Disabling the gate will produce an error and explicitly enabling will produce a warning log. 4. A `stable` feature gate will be removed in the version specified by its `ToVersion` value. -Features that prove unworkable in the `alpha` stage may be discontinued +Features that prove unworkable in the `alpha` stage may be discontinued without proceeding to the `beta` stage. Instead, they will proceed to the `deprecated` stage, which will feature is permanently disabled. A feature gate will be removed once it has been `deprecated` for at least 2 releases of the collector. diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_anyvalue.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_anyvalue.go index 103c4c5b4..404c61891 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_anyvalue.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_anyvalue.go @@ -13,6 +13,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -100,6 +101,17 @@ func (m *AnyValue) GetBytesValue() []byte { return nil } +type AnyValue_StringValueStrindex struct { + StringValueStrindex int32 +} + +func (m *AnyValue) GetStringValueStrindex() int32 { + if v, ok := m.GetValue().(*AnyValue_StringValueStrindex); ok { + return v.StringValueStrindex + } + return int32(0) +} + type AnyValue struct { Value any } @@ -152,10 +164,16 @@ var ( return &AnyValue_BytesValue{} }, } + + ProtoPoolAnyValue_StringValueStrindex = sync.Pool{ + New: func() any { + return &AnyValue_StringValueStrindex{} + }, + } ) func NewAnyValue() *AnyValue { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &AnyValue{} } return protoPoolAnyValue.Get().(*AnyValue) @@ -166,28 +184,28 @@ func DeleteAnyValue(orig *AnyValue, nullable bool) { return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } switch ov := orig.Value.(type) { case *AnyValue_StringValue: - if UseProtoPooling.IsEnabled() { + if metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov.StringValue = "" ProtoPoolAnyValue_StringValue.Put(ov) } case *AnyValue_BoolValue: - if UseProtoPooling.IsEnabled() { + if metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov.BoolValue = false ProtoPoolAnyValue_BoolValue.Put(ov) } case *AnyValue_IntValue: - if UseProtoPooling.IsEnabled() { + if metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov.IntValue = int64(0) ProtoPoolAnyValue_IntValue.Put(ov) } case *AnyValue_DoubleValue: - if UseProtoPooling.IsEnabled() { + if metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov.DoubleValue = float64(0) ProtoPoolAnyValue_DoubleValue.Put(ov) } @@ -200,10 +218,15 @@ func DeleteAnyValue(orig *AnyValue, nullable bool) { ov.KvlistValue = nil ProtoPoolAnyValue_KvlistValue.Put(ov) case *AnyValue_BytesValue: - if UseProtoPooling.IsEnabled() { + if metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov.BytesValue = nil ProtoPoolAnyValue_BytesValue.Put(ov) } + case *AnyValue_StringValueStrindex: + if metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { + ov.StringValueStrindex = int32(0) + ProtoPoolAnyValue_StringValueStrindex.Put(ov) + } } orig.Reset() if nullable { @@ -227,7 +250,7 @@ func CopyAnyValue(dest, src *AnyValue) *AnyValue { switch t := src.Value.(type) { case *AnyValue_StringValue: var ov *AnyValue_StringValue - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &AnyValue_StringValue{} } else { ov = ProtoPoolAnyValue_StringValue.Get().(*AnyValue_StringValue) @@ -237,7 +260,7 @@ func CopyAnyValue(dest, src *AnyValue) *AnyValue { case *AnyValue_BoolValue: var ov *AnyValue_BoolValue - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &AnyValue_BoolValue{} } else { ov = ProtoPoolAnyValue_BoolValue.Get().(*AnyValue_BoolValue) @@ -247,7 +270,7 @@ func CopyAnyValue(dest, src *AnyValue) *AnyValue { case *AnyValue_IntValue: var ov *AnyValue_IntValue - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &AnyValue_IntValue{} } else { ov = ProtoPoolAnyValue_IntValue.Get().(*AnyValue_IntValue) @@ -257,7 +280,7 @@ func CopyAnyValue(dest, src *AnyValue) *AnyValue { case *AnyValue_DoubleValue: var ov *AnyValue_DoubleValue - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &AnyValue_DoubleValue{} } else { ov = ProtoPoolAnyValue_DoubleValue.Get().(*AnyValue_DoubleValue) @@ -267,7 +290,7 @@ func CopyAnyValue(dest, src *AnyValue) *AnyValue { case *AnyValue_ArrayValue: var ov *AnyValue_ArrayValue - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &AnyValue_ArrayValue{} } else { ov = ProtoPoolAnyValue_ArrayValue.Get().(*AnyValue_ArrayValue) @@ -278,7 +301,7 @@ func CopyAnyValue(dest, src *AnyValue) *AnyValue { case *AnyValue_KvlistValue: var ov *AnyValue_KvlistValue - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &AnyValue_KvlistValue{} } else { ov = ProtoPoolAnyValue_KvlistValue.Get().(*AnyValue_KvlistValue) @@ -289,7 +312,7 @@ func CopyAnyValue(dest, src *AnyValue) *AnyValue { case *AnyValue_BytesValue: var ov *AnyValue_BytesValue - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &AnyValue_BytesValue{} } else { ov = ProtoPoolAnyValue_BytesValue.Get().(*AnyValue_BytesValue) @@ -297,6 +320,16 @@ func CopyAnyValue(dest, src *AnyValue) *AnyValue { ov.BytesValue = t.BytesValue dest.Value = ov + case *AnyValue_StringValueStrindex: + var ov *AnyValue_StringValueStrindex + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { + ov = &AnyValue_StringValueStrindex{} + } else { + ov = ProtoPoolAnyValue_StringValueStrindex.Get().(*AnyValue_StringValueStrindex) + } + ov.StringValueStrindex = t.StringValueStrindex + dest.Value = ov + default: dest.Value = nil } @@ -386,6 +419,9 @@ func (orig *AnyValue) MarshalJSON(dest *json.Stream) { dest.WriteObjectField("bytesValue") dest.WriteBytes(orig.BytesValue) + case *AnyValue_StringValueStrindex: + dest.WriteObjectField("stringValueStrindex") + dest.WriteInt32(orig.StringValueStrindex) } dest.WriteObjectEnd() } @@ -398,7 +434,7 @@ func (orig *AnyValue) UnmarshalJSON(iter *json.Iterator) { case "stringValue", "string_value": { var ov *AnyValue_StringValue - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &AnyValue_StringValue{} } else { ov = ProtoPoolAnyValue_StringValue.Get().(*AnyValue_StringValue) @@ -409,7 +445,7 @@ func (orig *AnyValue) UnmarshalJSON(iter *json.Iterator) { case "boolValue", "bool_value": { var ov *AnyValue_BoolValue - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &AnyValue_BoolValue{} } else { ov = ProtoPoolAnyValue_BoolValue.Get().(*AnyValue_BoolValue) @@ -420,7 +456,7 @@ func (orig *AnyValue) UnmarshalJSON(iter *json.Iterator) { case "intValue", "int_value": { var ov *AnyValue_IntValue - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &AnyValue_IntValue{} } else { ov = ProtoPoolAnyValue_IntValue.Get().(*AnyValue_IntValue) @@ -431,7 +467,7 @@ func (orig *AnyValue) UnmarshalJSON(iter *json.Iterator) { case "doubleValue", "double_value": { var ov *AnyValue_DoubleValue - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &AnyValue_DoubleValue{} } else { ov = ProtoPoolAnyValue_DoubleValue.Get().(*AnyValue_DoubleValue) @@ -442,7 +478,7 @@ func (orig *AnyValue) UnmarshalJSON(iter *json.Iterator) { case "arrayValue", "array_value": { var ov *AnyValue_ArrayValue - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &AnyValue_ArrayValue{} } else { ov = ProtoPoolAnyValue_ArrayValue.Get().(*AnyValue_ArrayValue) @@ -454,7 +490,7 @@ func (orig *AnyValue) UnmarshalJSON(iter *json.Iterator) { case "kvlistValue", "kvlist_value": { var ov *AnyValue_KvlistValue - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &AnyValue_KvlistValue{} } else { ov = ProtoPoolAnyValue_KvlistValue.Get().(*AnyValue_KvlistValue) @@ -466,7 +502,7 @@ func (orig *AnyValue) UnmarshalJSON(iter *json.Iterator) { case "bytesValue", "bytes_value": { var ov *AnyValue_BytesValue - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &AnyValue_BytesValue{} } else { ov = ProtoPoolAnyValue_BytesValue.Get().(*AnyValue_BytesValue) @@ -474,6 +510,17 @@ func (orig *AnyValue) UnmarshalJSON(iter *json.Iterator) { ov.BytesValue = iter.ReadBytes() orig.Value = ov } + case "stringValueStrindex", "string_value_strindex": + { + var ov *AnyValue_StringValueStrindex + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { + ov = &AnyValue_StringValueStrindex{} + } else { + ov = ProtoPoolAnyValue_StringValueStrindex.Get().(*AnyValue_StringValueStrindex) + } + ov.StringValueStrindex = iter.ReadInt32() + orig.Value = ov + } default: iter.Skip() @@ -514,6 +561,9 @@ func (orig *AnyValue) SizeProto() int { case *AnyValue_BytesValue: l = len(orig.BytesValue) n += 1 + proto.Sov(uint64(l)) + l + case *AnyValue_StringValueStrindex: + + n += 1 + proto.Sov(uint64(orig.StringValueStrindex)) } return n } @@ -576,6 +626,11 @@ func (orig *AnyValue) MarshalProto(buf []byte) int { pos-- buf[pos] = 0x3a + case *AnyValue_StringValueStrindex: + pos = proto.EncodeVarint(buf, pos, uint64(orig.StringValueStrindex)) + pos-- + buf[pos] = 0x40 + } return len(buf) - pos } @@ -606,7 +661,7 @@ func (orig *AnyValue) UnmarshalProto(buf []byte) error { } startPos := pos - length var ov *AnyValue_StringValue - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &AnyValue_StringValue{} } else { ov = ProtoPoolAnyValue_StringValue.Get().(*AnyValue_StringValue) @@ -624,7 +679,7 @@ func (orig *AnyValue) UnmarshalProto(buf []byte) error { return err } var ov *AnyValue_BoolValue - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &AnyValue_BoolValue{} } else { ov = ProtoPoolAnyValue_BoolValue.Get().(*AnyValue_BoolValue) @@ -642,7 +697,7 @@ func (orig *AnyValue) UnmarshalProto(buf []byte) error { return err } var ov *AnyValue_IntValue - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &AnyValue_IntValue{} } else { ov = ProtoPoolAnyValue_IntValue.Get().(*AnyValue_IntValue) @@ -660,7 +715,7 @@ func (orig *AnyValue) UnmarshalProto(buf []byte) error { return err } var ov *AnyValue_DoubleValue - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &AnyValue_DoubleValue{} } else { ov = ProtoPoolAnyValue_DoubleValue.Get().(*AnyValue_DoubleValue) @@ -679,7 +734,7 @@ func (orig *AnyValue) UnmarshalProto(buf []byte) error { } startPos := pos - length var ov *AnyValue_ArrayValue - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &AnyValue_ArrayValue{} } else { ov = ProtoPoolAnyValue_ArrayValue.Get().(*AnyValue_ArrayValue) @@ -702,7 +757,7 @@ func (orig *AnyValue) UnmarshalProto(buf []byte) error { } startPos := pos - length var ov *AnyValue_KvlistValue - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &AnyValue_KvlistValue{} } else { ov = ProtoPoolAnyValue_KvlistValue.Get().(*AnyValue_KvlistValue) @@ -725,7 +780,7 @@ func (orig *AnyValue) UnmarshalProto(buf []byte) error { } startPos := pos - length var ov *AnyValue_BytesValue - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &AnyValue_BytesValue{} } else { ov = ProtoPoolAnyValue_BytesValue.Get().(*AnyValue_BytesValue) @@ -736,6 +791,24 @@ func (orig *AnyValue) UnmarshalProto(buf []byte) error { } orig.Value = ov + case 8: + if wireType != proto.WireTypeVarint { + return fmt.Errorf("proto: wrong wireType = %d for field StringValueStrindex", wireType) + } + var num uint64 + num, pos, err = proto.ConsumeVarint(buf, pos) + if err != nil { + return err + } + var ov *AnyValue_StringValueStrindex + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { + ov = &AnyValue_StringValueStrindex{} + } else { + ov = ProtoPoolAnyValue_StringValueStrindex.Get().(*AnyValue_StringValueStrindex) + } + ov.StringValueStrindex = int32(num) + orig.Value = ov + default: pos, err = proto.ConsumeUnknown(buf, pos, wireType) if err != nil { diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_arrayvalue.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_arrayvalue.go index f973831cf..dc041f4e6 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_arrayvalue.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_arrayvalue.go @@ -11,6 +11,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -28,7 +29,7 @@ var ( ) func NewArrayValue() *ArrayValue { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &ArrayValue{} } return protoPoolArrayValue.Get().(*ArrayValue) @@ -39,7 +40,7 @@ func DeleteArrayValue(orig *ArrayValue, nullable bool) { return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_entityref.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_entityref.go index d326cfe46..58c6b3249 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_entityref.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_entityref.go @@ -11,6 +11,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -30,7 +31,7 @@ var ( ) func NewEntityRef() *EntityRef { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &EntityRef{} } return protoPoolEntityRef.Get().(*EntityRef) @@ -41,7 +42,7 @@ func DeleteEntityRef(orig *EntityRef, nullable bool) { return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exemplar.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exemplar.go index 5516bfd20..231d1a79e 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exemplar.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exemplar.go @@ -13,6 +13,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -78,7 +79,7 @@ var ( ) func NewExemplar() *Exemplar { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &Exemplar{} } return protoPoolExemplar.Get().(*Exemplar) @@ -89,7 +90,7 @@ func DeleteExemplar(orig *Exemplar, nullable bool) { return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } @@ -99,12 +100,12 @@ func DeleteExemplar(orig *Exemplar, nullable bool) { switch ov := orig.Value.(type) { case *Exemplar_AsDouble: - if UseProtoPooling.IsEnabled() { + if metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov.AsDouble = float64(0) ProtoPoolExemplar_AsDouble.Put(ov) } case *Exemplar_AsInt: - if UseProtoPooling.IsEnabled() { + if metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov.AsInt = int64(0) ProtoPoolExemplar_AsInt.Put(ov) } @@ -136,7 +137,7 @@ func CopyExemplar(dest, src *Exemplar) *Exemplar { switch t := src.Value.(type) { case *Exemplar_AsDouble: var ov *Exemplar_AsDouble - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &Exemplar_AsDouble{} } else { ov = ProtoPoolExemplar_AsDouble.Get().(*Exemplar_AsDouble) @@ -146,7 +147,7 @@ func CopyExemplar(dest, src *Exemplar) *Exemplar { case *Exemplar_AsInt: var ov *Exemplar_AsInt - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &Exemplar_AsInt{} } else { ov = ProtoPoolExemplar_AsInt.Get().(*Exemplar_AsInt) @@ -268,7 +269,7 @@ func (orig *Exemplar) UnmarshalJSON(iter *json.Iterator) { case "asDouble", "as_double": { var ov *Exemplar_AsDouble - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &Exemplar_AsDouble{} } else { ov = ProtoPoolExemplar_AsDouble.Get().(*Exemplar_AsDouble) @@ -279,7 +280,7 @@ func (orig *Exemplar) UnmarshalJSON(iter *json.Iterator) { case "asInt", "as_int": { var ov *Exemplar_AsInt - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &Exemplar_AsInt{} } else { ov = ProtoPoolExemplar_AsInt.Get().(*Exemplar_AsInt) @@ -428,7 +429,7 @@ func (orig *Exemplar) UnmarshalProto(buf []byte) error { return err } var ov *Exemplar_AsDouble - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &Exemplar_AsDouble{} } else { ov = ProtoPoolExemplar_AsDouble.Get().(*Exemplar_AsDouble) @@ -446,7 +447,7 @@ func (orig *Exemplar) UnmarshalProto(buf []byte) error { return err } var ov *Exemplar_AsInt - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &Exemplar_AsInt{} } else { ov = ProtoPoolExemplar_AsInt.Get().(*Exemplar_AsInt) diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exponentialhistogram.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exponentialhistogram.go index 5d5e07793..d46dc1344 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exponentialhistogram.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exponentialhistogram.go @@ -11,6 +11,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -30,7 +31,7 @@ var ( ) func NewExponentialHistogram() *ExponentialHistogram { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &ExponentialHistogram{} } return protoPoolExponentialHistogram.Get().(*ExponentialHistogram) @@ -41,7 +42,7 @@ func DeleteExponentialHistogram(orig *ExponentialHistogram, nullable bool) { return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exponentialhistogramdatapoint.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exponentialhistogramdatapoint.go index e0407b073..c637459b3 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exponentialhistogramdatapoint.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exponentialhistogramdatapoint.go @@ -13,6 +13,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -47,7 +48,7 @@ var ( ) func NewExponentialHistogramDataPoint() *ExponentialHistogramDataPoint { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &ExponentialHistogramDataPoint{} } return protoPoolExponentialHistogramDataPoint.Get().(*ExponentialHistogramDataPoint) @@ -58,7 +59,7 @@ func DeleteExponentialHistogramDataPoint(orig *ExponentialHistogramDataPoint, nu return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exponentialhistogramdatapointbuckets.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exponentialhistogramdatapointbuckets.go index 15243f12d..6908a66d2 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exponentialhistogramdatapointbuckets.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exponentialhistogramdatapointbuckets.go @@ -11,6 +11,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -29,7 +30,7 @@ var ( ) func NewExponentialHistogramDataPointBuckets() *ExponentialHistogramDataPointBuckets { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &ExponentialHistogramDataPointBuckets{} } return protoPoolExponentialHistogramDataPointBuckets.Get().(*ExponentialHistogramDataPointBuckets) @@ -40,7 +41,7 @@ func DeleteExponentialHistogramDataPointBuckets(orig *ExponentialHistogramDataPo return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exportlogspartialsuccess.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exportlogspartialsuccess.go index bccd38e7d..2e3eb5060 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exportlogspartialsuccess.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exportlogspartialsuccess.go @@ -11,6 +11,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -29,7 +30,7 @@ var ( ) func NewExportLogsPartialSuccess() *ExportLogsPartialSuccess { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &ExportLogsPartialSuccess{} } return protoPoolExportLogsPartialSuccess.Get().(*ExportLogsPartialSuccess) @@ -40,7 +41,7 @@ func DeleteExportLogsPartialSuccess(orig *ExportLogsPartialSuccess, nullable boo return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exportlogsservicerequest.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exportlogsservicerequest.go index 7fb48b36a..cdfb591d7 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exportlogsservicerequest.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exportlogsservicerequest.go @@ -11,6 +11,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -29,7 +30,7 @@ var ( ) func NewExportLogsServiceRequest() *ExportLogsServiceRequest { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &ExportLogsServiceRequest{} } return protoPoolExportLogsServiceRequest.Get().(*ExportLogsServiceRequest) @@ -40,7 +41,7 @@ func DeleteExportLogsServiceRequest(orig *ExportLogsServiceRequest, nullable boo return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exportlogsserviceresponse.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exportlogsserviceresponse.go index 5570fe93d..b2271520f 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exportlogsserviceresponse.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exportlogsserviceresponse.go @@ -11,6 +11,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -28,7 +29,7 @@ var ( ) func NewExportLogsServiceResponse() *ExportLogsServiceResponse { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &ExportLogsServiceResponse{} } return protoPoolExportLogsServiceResponse.Get().(*ExportLogsServiceResponse) @@ -39,7 +40,7 @@ func DeleteExportLogsServiceResponse(orig *ExportLogsServiceResponse, nullable b return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exportmetricspartialsuccess.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exportmetricspartialsuccess.go index 4915d3cb7..27e965641 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exportmetricspartialsuccess.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exportmetricspartialsuccess.go @@ -11,6 +11,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -29,7 +30,7 @@ var ( ) func NewExportMetricsPartialSuccess() *ExportMetricsPartialSuccess { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &ExportMetricsPartialSuccess{} } return protoPoolExportMetricsPartialSuccess.Get().(*ExportMetricsPartialSuccess) @@ -40,7 +41,7 @@ func DeleteExportMetricsPartialSuccess(orig *ExportMetricsPartialSuccess, nullab return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exportmetricsservicerequest.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exportmetricsservicerequest.go index 76cc8020c..c926b5487 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exportmetricsservicerequest.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exportmetricsservicerequest.go @@ -11,6 +11,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -29,7 +30,7 @@ var ( ) func NewExportMetricsServiceRequest() *ExportMetricsServiceRequest { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &ExportMetricsServiceRequest{} } return protoPoolExportMetricsServiceRequest.Get().(*ExportMetricsServiceRequest) @@ -40,7 +41,7 @@ func DeleteExportMetricsServiceRequest(orig *ExportMetricsServiceRequest, nullab return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exportmetricsserviceresponse.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exportmetricsserviceresponse.go index ae78a10f9..222d5825f 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exportmetricsserviceresponse.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exportmetricsserviceresponse.go @@ -11,6 +11,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -28,7 +29,7 @@ var ( ) func NewExportMetricsServiceResponse() *ExportMetricsServiceResponse { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &ExportMetricsServiceResponse{} } return protoPoolExportMetricsServiceResponse.Get().(*ExportMetricsServiceResponse) @@ -39,7 +40,7 @@ func DeleteExportMetricsServiceResponse(orig *ExportMetricsServiceResponse, null return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exportprofilespartialsuccess.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exportprofilespartialsuccess.go index 5a75e7a65..8077e8a04 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exportprofilespartialsuccess.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exportprofilespartialsuccess.go @@ -11,6 +11,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -29,7 +30,7 @@ var ( ) func NewExportProfilesPartialSuccess() *ExportProfilesPartialSuccess { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &ExportProfilesPartialSuccess{} } return protoPoolExportProfilesPartialSuccess.Get().(*ExportProfilesPartialSuccess) @@ -40,7 +41,7 @@ func DeleteExportProfilesPartialSuccess(orig *ExportProfilesPartialSuccess, null return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exportprofilesservicerequest.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exportprofilesservicerequest.go index ba9ecbc4e..72d876c97 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exportprofilesservicerequest.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exportprofilesservicerequest.go @@ -11,6 +11,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -30,7 +31,7 @@ var ( ) func NewExportProfilesServiceRequest() *ExportProfilesServiceRequest { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &ExportProfilesServiceRequest{} } return protoPoolExportProfilesServiceRequest.Get().(*ExportProfilesServiceRequest) @@ -41,7 +42,7 @@ func DeleteExportProfilesServiceRequest(orig *ExportProfilesServiceRequest, null return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exportprofilesserviceresponse.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exportprofilesserviceresponse.go index e8fea55ea..383058bc6 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exportprofilesserviceresponse.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exportprofilesserviceresponse.go @@ -11,6 +11,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -28,7 +29,7 @@ var ( ) func NewExportProfilesServiceResponse() *ExportProfilesServiceResponse { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &ExportProfilesServiceResponse{} } return protoPoolExportProfilesServiceResponse.Get().(*ExportProfilesServiceResponse) @@ -39,7 +40,7 @@ func DeleteExportProfilesServiceResponse(orig *ExportProfilesServiceResponse, nu return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exporttracepartialsuccess.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exporttracepartialsuccess.go index 6df4657fa..bf6b8f6bf 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exporttracepartialsuccess.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exporttracepartialsuccess.go @@ -11,6 +11,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -29,7 +30,7 @@ var ( ) func NewExportTracePartialSuccess() *ExportTracePartialSuccess { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &ExportTracePartialSuccess{} } return protoPoolExportTracePartialSuccess.Get().(*ExportTracePartialSuccess) @@ -40,7 +41,7 @@ func DeleteExportTracePartialSuccess(orig *ExportTracePartialSuccess, nullable b return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exporttraceservicerequest.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exporttraceservicerequest.go index 2a4ff9ef3..408d5aa46 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exporttraceservicerequest.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exporttraceservicerequest.go @@ -11,6 +11,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -29,7 +30,7 @@ var ( ) func NewExportTraceServiceRequest() *ExportTraceServiceRequest { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &ExportTraceServiceRequest{} } return protoPoolExportTraceServiceRequest.Get().(*ExportTraceServiceRequest) @@ -40,7 +41,7 @@ func DeleteExportTraceServiceRequest(orig *ExportTraceServiceRequest, nullable b return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exporttraceserviceresponse.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exporttraceserviceresponse.go index f3d35d4b9..4437f3dec 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exporttraceserviceresponse.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_exporttraceserviceresponse.go @@ -11,6 +11,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -28,7 +29,7 @@ var ( ) func NewExportTraceServiceResponse() *ExportTraceServiceResponse { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &ExportTraceServiceResponse{} } return protoPoolExportTraceServiceResponse.Get().(*ExportTraceServiceResponse) @@ -39,7 +40,7 @@ func DeleteExportTraceServiceResponse(orig *ExportTraceServiceResponse, nullable return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_function.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_function.go index 06bc218b1..a2d0b1b86 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_function.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_function.go @@ -11,6 +11,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -31,7 +32,7 @@ var ( ) func NewFunction() *Function { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &Function{} } return protoPoolFunction.Get().(*Function) @@ -42,7 +43,7 @@ func DeleteFunction(orig *Function, nullable bool) { return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_gauge.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_gauge.go index 996d66242..5d2b46751 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_gauge.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_gauge.go @@ -11,6 +11,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -28,7 +29,7 @@ var ( ) func NewGauge() *Gauge { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &Gauge{} } return protoPoolGauge.Get().(*Gauge) @@ -39,7 +40,7 @@ func DeleteGauge(orig *Gauge, nullable bool) { return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_histogram.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_histogram.go index 09fab65bb..3d9c149ce 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_histogram.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_histogram.go @@ -11,6 +11,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -29,7 +30,7 @@ var ( ) func NewHistogram() *Histogram { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &Histogram{} } return protoPoolHistogram.Get().(*Histogram) @@ -40,7 +41,7 @@ func DeleteHistogram(orig *Histogram, nullable bool) { return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_histogramdatapoint.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_histogramdatapoint.go index b43e3cbb8..0d28369f4 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_histogramdatapoint.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_histogramdatapoint.go @@ -13,6 +13,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -41,7 +42,7 @@ var ( ) func NewHistogramDataPoint() *HistogramDataPoint { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &HistogramDataPoint{} } return protoPoolHistogramDataPoint.Get().(*HistogramDataPoint) @@ -52,7 +53,7 @@ func DeleteHistogramDataPoint(orig *HistogramDataPoint, nullable bool) { return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_instrumentationscope.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_instrumentationscope.go index ab44a2eab..a8162b433 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_instrumentationscope.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_instrumentationscope.go @@ -11,6 +11,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -31,7 +32,7 @@ var ( ) func NewInstrumentationScope() *InstrumentationScope { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &InstrumentationScope{} } return protoPoolInstrumentationScope.Get().(*InstrumentationScope) @@ -42,7 +43,7 @@ func DeleteInstrumentationScope(orig *InstrumentationScope, nullable bool) { return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_ipaddr.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_ipaddr.go index d77ec13a9..3b72d1d22 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_ipaddr.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_ipaddr.go @@ -11,6 +11,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -28,7 +29,7 @@ var ( ) func NewIPAddr() *IPAddr { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &IPAddr{} } return protoPoolIPAddr.Get().(*IPAddr) @@ -39,7 +40,7 @@ func DeleteIPAddr(orig *IPAddr, nullable bool) { return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_keyvalue.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_keyvalue.go index 038cb114d..5f80a111a 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_keyvalue.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_keyvalue.go @@ -11,12 +11,14 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) type KeyValue struct { - Value AnyValue - Key string + Value AnyValue + Key string + KeyStrindex int32 } var ( @@ -28,7 +30,7 @@ var ( ) func NewKeyValue() *KeyValue { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &KeyValue{} } return protoPoolKeyValue.Get().(*KeyValue) @@ -39,12 +41,13 @@ func DeleteKeyValue(orig *KeyValue, nullable bool) { return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } DeleteAnyValue(&orig.Value, false) + orig.Reset() if nullable { protoPoolKeyValue.Put(orig) @@ -67,6 +70,8 @@ func CopyKeyValue(dest, src *KeyValue) *KeyValue { dest.Key = src.Key CopyAnyValue(&dest.Value, &src.Value) + dest.KeyStrindex = src.KeyStrindex + return dest } @@ -131,6 +136,10 @@ func (orig *KeyValue) MarshalJSON(dest *json.Stream) { } dest.WriteObjectField("value") orig.Value.MarshalJSON(dest) + if orig.KeyStrindex != int32(0) { + dest.WriteObjectField("keyStrindex") + dest.WriteInt32(orig.KeyStrindex) + } dest.WriteObjectEnd() } @@ -143,6 +152,8 @@ func (orig *KeyValue) UnmarshalJSON(iter *json.Iterator) { case "value": orig.Value.UnmarshalJSON(iter) + case "keyStrindex", "key_strindex": + orig.KeyStrindex = iter.ReadInt32() default: iter.Skip() } @@ -160,6 +171,9 @@ func (orig *KeyValue) SizeProto() int { } l = orig.Value.SizeProto() n += 1 + proto.Sov(uint64(l)) + l + if orig.KeyStrindex != int32(0) { + n += 1 + proto.Sov(uint64(orig.KeyStrindex)) + } return n } @@ -181,6 +195,11 @@ func (orig *KeyValue) MarshalProto(buf []byte) int { pos-- buf[pos] = 0x12 + if orig.KeyStrindex != int32(0) { + pos = proto.EncodeVarint(buf, pos, uint64(orig.KeyStrindex)) + pos-- + buf[pos] = 0x18 + } return len(buf) - pos } @@ -226,6 +245,17 @@ func (orig *KeyValue) UnmarshalProto(buf []byte) error { if err != nil { return err } + + case 3: + if wireType != proto.WireTypeVarint { + return fmt.Errorf("proto: wrong wireType = %d for field KeyStrindex", wireType) + } + var num uint64 + num, pos, err = proto.ConsumeVarint(buf, pos) + if err != nil { + return err + } + orig.KeyStrindex = int32(num) default: pos, err = proto.ConsumeUnknown(buf, pos, wireType) if err != nil { @@ -240,6 +270,7 @@ func GenTestKeyValue() *KeyValue { orig := NewKeyValue() orig.Key = "test_key" orig.Value = *GenTestAnyValue() + orig.KeyStrindex = int32(13) return orig } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_keyvalueandunit.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_keyvalueandunit.go index 493ad947f..3e0c6cf92 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_keyvalueandunit.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_keyvalueandunit.go @@ -11,6 +11,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -32,7 +33,7 @@ var ( ) func NewKeyValueAndUnit() *KeyValueAndUnit { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &KeyValueAndUnit{} } return protoPoolKeyValueAndUnit.Get().(*KeyValueAndUnit) @@ -43,7 +44,7 @@ func DeleteKeyValueAndUnit(orig *KeyValueAndUnit, nullable bool) { return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_keyvaluelist.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_keyvaluelist.go index 9e01d808a..9cb772d4c 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_keyvaluelist.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_keyvaluelist.go @@ -11,6 +11,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -28,7 +29,7 @@ var ( ) func NewKeyValueList() *KeyValueList { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &KeyValueList{} } return protoPoolKeyValueList.Get().(*KeyValueList) @@ -39,7 +40,7 @@ func DeleteKeyValueList(orig *KeyValueList, nullable bool) { return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_line.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_line.go index f6db6871b..0fe3a738b 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_line.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_line.go @@ -11,6 +11,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -30,7 +31,7 @@ var ( ) func NewLine() *Line { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &Line{} } return protoPoolLine.Get().(*Line) @@ -41,7 +42,7 @@ func DeleteLine(orig *Line, nullable bool) { return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_link.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_link.go index 6df8aa77f..9d62117e8 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_link.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_link.go @@ -11,6 +11,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -29,7 +30,7 @@ var ( ) func NewLink() *Link { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &Link{} } return protoPoolLink.Get().(*Link) @@ -40,7 +41,7 @@ func DeleteLink(orig *Link, nullable bool) { return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_location.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_location.go index a9eebb1f6..c75ed04c9 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_location.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_location.go @@ -11,6 +11,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -31,7 +32,7 @@ var ( ) func NewLocation() *Location { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &Location{} } return protoPoolLocation.Get().(*Location) @@ -42,7 +43,7 @@ func DeleteLocation(orig *Location, nullable bool) { return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_logrecord.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_logrecord.go index 6d5057b57..c3e449246 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_logrecord.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_logrecord.go @@ -12,6 +12,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -40,7 +41,7 @@ var ( ) func NewLogRecord() *LogRecord { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &LogRecord{} } return protoPoolLogRecord.Get().(*LogRecord) @@ -51,7 +52,7 @@ func DeleteLogRecord(orig *LogRecord, nullable bool) { return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_logsdata.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_logsdata.go index 747684f1c..7f7f3bfb9 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_logsdata.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_logsdata.go @@ -11,6 +11,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -30,7 +31,7 @@ var ( ) func NewLogsData() *LogsData { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &LogsData{} } return protoPoolLogsData.Get().(*LogsData) @@ -41,7 +42,7 @@ func DeleteLogsData(orig *LogsData, nullable bool) { return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_logsrequest.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_logsrequest.go index 94b915df0..4e18c3050 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_logsrequest.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_logsrequest.go @@ -12,6 +12,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -30,7 +31,7 @@ var ( ) func NewLogsRequest() *LogsRequest { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &LogsRequest{} } return protoPoolLogsRequest.Get().(*LogsRequest) @@ -41,7 +42,7 @@ func DeleteLogsRequest(orig *LogsRequest, nullable bool) { return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_mapping.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_mapping.go index 8a91a0762..ec1462389 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_mapping.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_mapping.go @@ -11,6 +11,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -32,7 +33,7 @@ var ( ) func NewMapping() *Mapping { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &Mapping{} } return protoPoolMapping.Get().(*Mapping) @@ -43,7 +44,7 @@ func DeleteMapping(orig *Mapping, nullable bool) { return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_metric.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_metric.go index 6e5fa339f..b7c1587b9 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_metric.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_metric.go @@ -11,6 +11,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -125,7 +126,7 @@ var ( ) func NewMetric() *Metric { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &Metric{} } return protoPoolMetric.Get().(*Metric) @@ -136,7 +137,7 @@ func DeleteMetric(orig *Metric, nullable bool) { return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } @@ -191,7 +192,7 @@ func CopyMetric(dest, src *Metric) *Metric { switch t := src.Data.(type) { case *Metric_Gauge: var ov *Metric_Gauge - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &Metric_Gauge{} } else { ov = ProtoPoolMetric_Gauge.Get().(*Metric_Gauge) @@ -202,7 +203,7 @@ func CopyMetric(dest, src *Metric) *Metric { case *Metric_Sum: var ov *Metric_Sum - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &Metric_Sum{} } else { ov = ProtoPoolMetric_Sum.Get().(*Metric_Sum) @@ -213,7 +214,7 @@ func CopyMetric(dest, src *Metric) *Metric { case *Metric_Histogram: var ov *Metric_Histogram - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &Metric_Histogram{} } else { ov = ProtoPoolMetric_Histogram.Get().(*Metric_Histogram) @@ -224,7 +225,7 @@ func CopyMetric(dest, src *Metric) *Metric { case *Metric_ExponentialHistogram: var ov *Metric_ExponentialHistogram - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &Metric_ExponentialHistogram{} } else { ov = ProtoPoolMetric_ExponentialHistogram.Get().(*Metric_ExponentialHistogram) @@ -235,7 +236,7 @@ func CopyMetric(dest, src *Metric) *Metric { case *Metric_Summary: var ov *Metric_Summary - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &Metric_Summary{} } else { ov = ProtoPoolMetric_Summary.Get().(*Metric_Summary) @@ -373,7 +374,7 @@ func (orig *Metric) UnmarshalJSON(iter *json.Iterator) { case "gauge": { var ov *Metric_Gauge - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &Metric_Gauge{} } else { ov = ProtoPoolMetric_Gauge.Get().(*Metric_Gauge) @@ -385,7 +386,7 @@ func (orig *Metric) UnmarshalJSON(iter *json.Iterator) { case "sum": { var ov *Metric_Sum - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &Metric_Sum{} } else { ov = ProtoPoolMetric_Sum.Get().(*Metric_Sum) @@ -397,7 +398,7 @@ func (orig *Metric) UnmarshalJSON(iter *json.Iterator) { case "histogram": { var ov *Metric_Histogram - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &Metric_Histogram{} } else { ov = ProtoPoolMetric_Histogram.Get().(*Metric_Histogram) @@ -409,7 +410,7 @@ func (orig *Metric) UnmarshalJSON(iter *json.Iterator) { case "exponentialHistogram", "exponential_histogram": { var ov *Metric_ExponentialHistogram - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &Metric_ExponentialHistogram{} } else { ov = ProtoPoolMetric_ExponentialHistogram.Get().(*Metric_ExponentialHistogram) @@ -421,7 +422,7 @@ func (orig *Metric) UnmarshalJSON(iter *json.Iterator) { case "summary": { var ov *Metric_Summary - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &Metric_Summary{} } else { ov = ProtoPoolMetric_Summary.Get().(*Metric_Summary) @@ -641,7 +642,7 @@ func (orig *Metric) UnmarshalProto(buf []byte) error { } startPos := pos - length var ov *Metric_Gauge - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &Metric_Gauge{} } else { ov = ProtoPoolMetric_Gauge.Get().(*Metric_Gauge) @@ -664,7 +665,7 @@ func (orig *Metric) UnmarshalProto(buf []byte) error { } startPos := pos - length var ov *Metric_Sum - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &Metric_Sum{} } else { ov = ProtoPoolMetric_Sum.Get().(*Metric_Sum) @@ -687,7 +688,7 @@ func (orig *Metric) UnmarshalProto(buf []byte) error { } startPos := pos - length var ov *Metric_Histogram - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &Metric_Histogram{} } else { ov = ProtoPoolMetric_Histogram.Get().(*Metric_Histogram) @@ -710,7 +711,7 @@ func (orig *Metric) UnmarshalProto(buf []byte) error { } startPos := pos - length var ov *Metric_ExponentialHistogram - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &Metric_ExponentialHistogram{} } else { ov = ProtoPoolMetric_ExponentialHistogram.Get().(*Metric_ExponentialHistogram) @@ -733,7 +734,7 @@ func (orig *Metric) UnmarshalProto(buf []byte) error { } startPos := pos - length var ov *Metric_Summary - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &Metric_Summary{} } else { ov = ProtoPoolMetric_Summary.Get().(*Metric_Summary) diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_metricsdata.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_metricsdata.go index aa7900f67..48248dc45 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_metricsdata.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_metricsdata.go @@ -11,6 +11,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -30,7 +31,7 @@ var ( ) func NewMetricsData() *MetricsData { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &MetricsData{} } return protoPoolMetricsData.Get().(*MetricsData) @@ -41,7 +42,7 @@ func DeleteMetricsData(orig *MetricsData, nullable bool) { return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_metricsrequest.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_metricsrequest.go index c2cca74a1..da51b989d 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_metricsrequest.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_metricsrequest.go @@ -12,6 +12,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -30,7 +31,7 @@ var ( ) func NewMetricsRequest() *MetricsRequest { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &MetricsRequest{} } return protoPoolMetricsRequest.Get().(*MetricsRequest) @@ -41,7 +42,7 @@ func DeleteMetricsRequest(orig *MetricsRequest, nullable bool) { return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_numberdatapoint.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_numberdatapoint.go index e413d6407..99f5f7661 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_numberdatapoint.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_numberdatapoint.go @@ -13,6 +13,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -76,7 +77,7 @@ var ( ) func NewNumberDataPoint() *NumberDataPoint { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &NumberDataPoint{} } return protoPoolNumberDataPoint.Get().(*NumberDataPoint) @@ -87,7 +88,7 @@ func DeleteNumberDataPoint(orig *NumberDataPoint, nullable bool) { return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } @@ -97,12 +98,12 @@ func DeleteNumberDataPoint(orig *NumberDataPoint, nullable bool) { switch ov := orig.Value.(type) { case *NumberDataPoint_AsDouble: - if UseProtoPooling.IsEnabled() { + if metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov.AsDouble = float64(0) ProtoPoolNumberDataPoint_AsDouble.Put(ov) } case *NumberDataPoint_AsInt: - if UseProtoPooling.IsEnabled() { + if metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov.AsInt = int64(0) ProtoPoolNumberDataPoint_AsInt.Put(ov) } @@ -137,7 +138,7 @@ func CopyNumberDataPoint(dest, src *NumberDataPoint) *NumberDataPoint { switch t := src.Value.(type) { case *NumberDataPoint_AsDouble: var ov *NumberDataPoint_AsDouble - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &NumberDataPoint_AsDouble{} } else { ov = ProtoPoolNumberDataPoint_AsDouble.Get().(*NumberDataPoint_AsDouble) @@ -147,7 +148,7 @@ func CopyNumberDataPoint(dest, src *NumberDataPoint) *NumberDataPoint { case *NumberDataPoint_AsInt: var ov *NumberDataPoint_AsInt - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &NumberDataPoint_AsInt{} } else { ov = ProtoPoolNumberDataPoint_AsInt.Get().(*NumberDataPoint_AsInt) @@ -281,7 +282,7 @@ func (orig *NumberDataPoint) UnmarshalJSON(iter *json.Iterator) { case "asDouble", "as_double": { var ov *NumberDataPoint_AsDouble - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &NumberDataPoint_AsDouble{} } else { ov = ProtoPoolNumberDataPoint_AsDouble.Get().(*NumberDataPoint_AsDouble) @@ -292,7 +293,7 @@ func (orig *NumberDataPoint) UnmarshalJSON(iter *json.Iterator) { case "asInt", "as_int": { var ov *NumberDataPoint_AsInt - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &NumberDataPoint_AsInt{} } else { ov = ProtoPoolNumberDataPoint_AsInt.Get().(*NumberDataPoint_AsInt) @@ -467,7 +468,7 @@ func (orig *NumberDataPoint) UnmarshalProto(buf []byte) error { return err } var ov *NumberDataPoint_AsDouble - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &NumberDataPoint_AsDouble{} } else { ov = ProtoPoolNumberDataPoint_AsDouble.Get().(*NumberDataPoint_AsDouble) @@ -485,7 +486,7 @@ func (orig *NumberDataPoint) UnmarshalProto(buf []byte) error { return err } var ov *NumberDataPoint_AsInt - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &NumberDataPoint_AsInt{} } else { ov = ProtoPoolNumberDataPoint_AsInt.Get().(*NumberDataPoint_AsInt) diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_profile.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_profile.go index 02167667d..d40303aee 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_profile.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_profile.go @@ -12,6 +12,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -40,7 +41,7 @@ var ( ) func NewProfile() *Profile { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &Profile{} } return protoPoolProfile.Get().(*Profile) @@ -51,7 +52,7 @@ func DeleteProfile(orig *Profile, nullable bool) { return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_profilesdata.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_profilesdata.go index 45a876f6d..491a81955 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_profilesdata.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_profilesdata.go @@ -11,6 +11,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -31,7 +32,7 @@ var ( ) func NewProfilesData() *ProfilesData { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &ProfilesData{} } return protoPoolProfilesData.Get().(*ProfilesData) @@ -42,7 +43,7 @@ func DeleteProfilesData(orig *ProfilesData, nullable bool) { return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_profilesdictionary.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_profilesdictionary.go index 8b8bef11c..8471828e6 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_profilesdictionary.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_profilesdictionary.go @@ -11,6 +11,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -34,7 +35,7 @@ var ( ) func NewProfilesDictionary() *ProfilesDictionary { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &ProfilesDictionary{} } return protoPoolProfilesDictionary.Get().(*ProfilesDictionary) @@ -45,7 +46,7 @@ func DeleteProfilesDictionary(orig *ProfilesDictionary, nullable bool) { return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_profilesrequest.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_profilesrequest.go index b8956807f..170547c09 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_profilesrequest.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_profilesrequest.go @@ -12,6 +12,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -30,7 +31,7 @@ var ( ) func NewProfilesRequest() *ProfilesRequest { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &ProfilesRequest{} } return protoPoolProfilesRequest.Get().(*ProfilesRequest) @@ -41,7 +42,7 @@ func DeleteProfilesRequest(orig *ProfilesRequest, nullable bool) { return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_requestcontext.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_requestcontext.go index eab9a270b..3aa89c1ca 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_requestcontext.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_requestcontext.go @@ -11,6 +11,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -104,7 +105,7 @@ var ( ) func NewRequestContext() *RequestContext { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &RequestContext{} } return protoPoolRequestContext.Get().(*RequestContext) @@ -115,7 +116,7 @@ func DeleteRequestContext(orig *RequestContext, nullable bool) { return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } @@ -167,7 +168,7 @@ func CopyRequestContext(dest, src *RequestContext) *RequestContext { switch t := src.ClientAddress.(type) { case *RequestContext_IP: var ov *RequestContext_IP - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &RequestContext_IP{} } else { ov = ProtoPoolRequestContext_IP.Get().(*RequestContext_IP) @@ -178,7 +179,7 @@ func CopyRequestContext(dest, src *RequestContext) *RequestContext { case *RequestContext_TCP: var ov *RequestContext_TCP - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &RequestContext_TCP{} } else { ov = ProtoPoolRequestContext_TCP.Get().(*RequestContext_TCP) @@ -189,7 +190,7 @@ func CopyRequestContext(dest, src *RequestContext) *RequestContext { case *RequestContext_UDP: var ov *RequestContext_UDP - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &RequestContext_UDP{} } else { ov = ProtoPoolRequestContext_UDP.Get().(*RequestContext_UDP) @@ -200,7 +201,7 @@ func CopyRequestContext(dest, src *RequestContext) *RequestContext { case *RequestContext_Unix: var ov *RequestContext_Unix - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &RequestContext_Unix{} } else { ov = ProtoPoolRequestContext_Unix.Get().(*RequestContext_Unix) @@ -326,7 +327,7 @@ func (orig *RequestContext) UnmarshalJSON(iter *json.Iterator) { case "iP": { var ov *RequestContext_IP - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &RequestContext_IP{} } else { ov = ProtoPoolRequestContext_IP.Get().(*RequestContext_IP) @@ -338,7 +339,7 @@ func (orig *RequestContext) UnmarshalJSON(iter *json.Iterator) { case "tCP": { var ov *RequestContext_TCP - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &RequestContext_TCP{} } else { ov = ProtoPoolRequestContext_TCP.Get().(*RequestContext_TCP) @@ -350,7 +351,7 @@ func (orig *RequestContext) UnmarshalJSON(iter *json.Iterator) { case "uDP": { var ov *RequestContext_UDP - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &RequestContext_UDP{} } else { ov = ProtoPoolRequestContext_UDP.Get().(*RequestContext_UDP) @@ -362,7 +363,7 @@ func (orig *RequestContext) UnmarshalJSON(iter *json.Iterator) { case "unix": { var ov *RequestContext_Unix - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &RequestContext_Unix{} } else { ov = ProtoPoolRequestContext_Unix.Get().(*RequestContext_Unix) @@ -532,7 +533,7 @@ func (orig *RequestContext) UnmarshalProto(buf []byte) error { } startPos := pos - length var ov *RequestContext_IP - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &RequestContext_IP{} } else { ov = ProtoPoolRequestContext_IP.Get().(*RequestContext_IP) @@ -555,7 +556,7 @@ func (orig *RequestContext) UnmarshalProto(buf []byte) error { } startPos := pos - length var ov *RequestContext_TCP - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &RequestContext_TCP{} } else { ov = ProtoPoolRequestContext_TCP.Get().(*RequestContext_TCP) @@ -578,7 +579,7 @@ func (orig *RequestContext) UnmarshalProto(buf []byte) error { } startPos := pos - length var ov *RequestContext_UDP - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &RequestContext_UDP{} } else { ov = ProtoPoolRequestContext_UDP.Get().(*RequestContext_UDP) @@ -601,7 +602,7 @@ func (orig *RequestContext) UnmarshalProto(buf []byte) error { } startPos := pos - length var ov *RequestContext_Unix - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { ov = &RequestContext_Unix{} } else { ov = ProtoPoolRequestContext_Unix.Get().(*RequestContext_Unix) diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_resource.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_resource.go index 0b846c62b..9a1a0bba1 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_resource.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_resource.go @@ -11,6 +11,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -30,7 +31,7 @@ var ( ) func NewResource() *Resource { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &Resource{} } return protoPoolResource.Get().(*Resource) @@ -41,7 +42,7 @@ func DeleteResource(orig *Resource, nullable bool) { return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_resourcelogs.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_resourcelogs.go index f7f645666..d7b8c732b 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_resourcelogs.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_resourcelogs.go @@ -11,6 +11,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -31,7 +32,7 @@ var ( ) func NewResourceLogs() *ResourceLogs { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &ResourceLogs{} } return protoPoolResourceLogs.Get().(*ResourceLogs) @@ -42,7 +43,7 @@ func DeleteResourceLogs(orig *ResourceLogs, nullable bool) { return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_resourcemetrics.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_resourcemetrics.go index dc61ce32c..364a719ba 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_resourcemetrics.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_resourcemetrics.go @@ -11,6 +11,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -31,7 +32,7 @@ var ( ) func NewResourceMetrics() *ResourceMetrics { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &ResourceMetrics{} } return protoPoolResourceMetrics.Get().(*ResourceMetrics) @@ -42,7 +43,7 @@ func DeleteResourceMetrics(orig *ResourceMetrics, nullable bool) { return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_resourceprofiles.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_resourceprofiles.go index e1b091072..3a6e83db2 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_resourceprofiles.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_resourceprofiles.go @@ -11,6 +11,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -30,7 +31,7 @@ var ( ) func NewResourceProfiles() *ResourceProfiles { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &ResourceProfiles{} } return protoPoolResourceProfiles.Get().(*ResourceProfiles) @@ -41,7 +42,7 @@ func DeleteResourceProfiles(orig *ResourceProfiles, nullable bool) { return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_resourcespans.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_resourcespans.go index fd29e9057..4c1bb0786 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_resourcespans.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_resourcespans.go @@ -11,6 +11,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -31,7 +32,7 @@ var ( ) func NewResourceSpans() *ResourceSpans { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &ResourceSpans{} } return protoPoolResourceSpans.Get().(*ResourceSpans) @@ -42,7 +43,7 @@ func DeleteResourceSpans(orig *ResourceSpans, nullable bool) { return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_sample.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_sample.go index 7a67e83f6..c53dc105a 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_sample.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_sample.go @@ -12,13 +12,14 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) // Sample represents each record value encountered within a profiled program. type Sample struct { - Values []int64 AttributeIndices []int32 + Values []int64 TimestampsUnixNano []uint64 StackIndex int32 LinkIndex int32 @@ -33,7 +34,7 @@ var ( ) func NewSample() *Sample { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &Sample{} } return protoPoolSample.Get().(*Sample) @@ -44,7 +45,7 @@ func DeleteSample(orig *Sample, nullable bool) { return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } @@ -69,11 +70,11 @@ func CopySample(dest, src *Sample) *Sample { dest = NewSample() } dest.StackIndex = src.StackIndex - dest.Values = append(dest.Values[:0], src.Values...) - dest.AttributeIndices = append(dest.AttributeIndices[:0], src.AttributeIndices...) dest.LinkIndex = src.LinkIndex + dest.Values = append(dest.Values[:0], src.Values...) + dest.TimestampsUnixNano = append(dest.TimestampsUnixNano[:0], src.TimestampsUnixNano...) return dest @@ -138,17 +139,6 @@ func (orig *Sample) MarshalJSON(dest *json.Stream) { dest.WriteObjectField("stackIndex") dest.WriteInt32(orig.StackIndex) } - if len(orig.Values) > 0 { - dest.WriteObjectField("values") - dest.WriteArrayStart() - dest.WriteInt64(orig.Values[0]) - for i := 1; i < len(orig.Values); i++ { - dest.WriteMore() - dest.WriteInt64(orig.Values[i]) - } - dest.WriteArrayEnd() - } - if len(orig.AttributeIndices) > 0 { dest.WriteObjectField("attributeIndices") dest.WriteArrayStart() @@ -164,6 +154,17 @@ func (orig *Sample) MarshalJSON(dest *json.Stream) { dest.WriteObjectField("linkIndex") dest.WriteInt32(orig.LinkIndex) } + if len(orig.Values) > 0 { + dest.WriteObjectField("values") + dest.WriteArrayStart() + dest.WriteInt64(orig.Values[0]) + for i := 1; i < len(orig.Values); i++ { + dest.WriteMore() + dest.WriteInt64(orig.Values[i]) + } + dest.WriteArrayEnd() + } + if len(orig.TimestampsUnixNano) > 0 { dest.WriteObjectField("timestampsUnixNano") dest.WriteArrayStart() @@ -184,11 +185,6 @@ func (orig *Sample) UnmarshalJSON(iter *json.Iterator) { switch f { case "stackIndex", "stack_index": orig.StackIndex = iter.ReadInt32() - case "values": - for iter.ReadArray() { - orig.Values = append(orig.Values, iter.ReadInt64()) - } - case "attributeIndices", "attribute_indices": for iter.ReadArray() { orig.AttributeIndices = append(orig.AttributeIndices, iter.ReadInt32()) @@ -196,6 +192,11 @@ func (orig *Sample) UnmarshalJSON(iter *json.Iterator) { case "linkIndex", "link_index": orig.LinkIndex = iter.ReadInt32() + case "values": + for iter.ReadArray() { + orig.Values = append(orig.Values, iter.ReadInt64()) + } + case "timestampsUnixNano", "timestamps_unix_nano": for iter.ReadArray() { orig.TimestampsUnixNano = append(orig.TimestampsUnixNano, iter.ReadUint64()) @@ -215,24 +216,24 @@ func (orig *Sample) SizeProto() int { n += 1 + proto.Sov(uint64(orig.StackIndex)) } - if len(orig.Values) > 0 { + if len(orig.AttributeIndices) > 0 { l = 0 - for _, e := range orig.Values { + for _, e := range orig.AttributeIndices { l += proto.Sov(uint64(e)) } n += 1 + proto.Sov(uint64(l)) + l } + if orig.LinkIndex != int32(0) { + n += 1 + proto.Sov(uint64(orig.LinkIndex)) + } - if len(orig.AttributeIndices) > 0 { + if len(orig.Values) > 0 { l = 0 - for _, e := range orig.AttributeIndices { + for _, e := range orig.Values { l += proto.Sov(uint64(e)) } n += 1 + proto.Sov(uint64(l)) + l } - if orig.LinkIndex != int32(0) { - n += 1 + proto.Sov(uint64(orig.LinkIndex)) - } l = len(orig.TimestampsUnixNano) if l > 0 { l *= 8 @@ -250,30 +251,30 @@ func (orig *Sample) MarshalProto(buf []byte) int { pos-- buf[pos] = 0x8 } - l = len(orig.Values) + l = len(orig.AttributeIndices) if l > 0 { endPos := pos for i := l - 1; i >= 0; i-- { - pos = proto.EncodeVarint(buf, pos, uint64(orig.Values[i])) + pos = proto.EncodeVarint(buf, pos, uint64(orig.AttributeIndices[i])) } pos = proto.EncodeVarint(buf, pos, uint64(endPos-pos)) pos-- buf[pos] = 0x12 } - l = len(orig.AttributeIndices) + if orig.LinkIndex != int32(0) { + pos = proto.EncodeVarint(buf, pos, uint64(orig.LinkIndex)) + pos-- + buf[pos] = 0x18 + } + l = len(orig.Values) if l > 0 { endPos := pos for i := l - 1; i >= 0; i-- { - pos = proto.EncodeVarint(buf, pos, uint64(orig.AttributeIndices[i])) + pos = proto.EncodeVarint(buf, pos, uint64(orig.Values[i])) } pos = proto.EncodeVarint(buf, pos, uint64(endPos-pos)) pos-- - buf[pos] = 0x1a - } - if orig.LinkIndex != int32(0) { - pos = proto.EncodeVarint(buf, pos, uint64(orig.LinkIndex)) - pos-- - buf[pos] = 0x20 + buf[pos] = 0x22 } l = len(orig.TimestampsUnixNano) if l > 0 { @@ -328,10 +329,10 @@ func (orig *Sample) UnmarshalProto(buf []byte) error { if err != nil { return err } - orig.Values = append(orig.Values, int64(num)) + orig.AttributeIndices = append(orig.AttributeIndices, int32(num)) } if startPos != pos { - return fmt.Errorf("proto: invalid field len = %d for field Values", pos-startPos) + return fmt.Errorf("proto: invalid field len = %d for field AttributeIndices", pos-startPos) } case proto.WireTypeVarint: var num uint64 @@ -339,11 +340,22 @@ func (orig *Sample) UnmarshalProto(buf []byte) error { if err != nil { return err } - orig.Values = append(orig.Values, int64(num)) + orig.AttributeIndices = append(orig.AttributeIndices, int32(num)) default: - return fmt.Errorf("proto: wrong wireType = %d for field Values", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field AttributeIndices", wireType) } + case 3: + if wireType != proto.WireTypeVarint { + return fmt.Errorf("proto: wrong wireType = %d for field LinkIndex", wireType) + } + var num uint64 + num, pos, err = proto.ConsumeVarint(buf, pos) + if err != nil { + return err + } + orig.LinkIndex = int32(num) + case 4: switch wireType { case proto.WireTypeLen: var length int @@ -358,10 +370,10 @@ func (orig *Sample) UnmarshalProto(buf []byte) error { if err != nil { return err } - orig.AttributeIndices = append(orig.AttributeIndices, int32(num)) + orig.Values = append(orig.Values, int64(num)) } if startPos != pos { - return fmt.Errorf("proto: invalid field len = %d for field AttributeIndices", pos-startPos) + return fmt.Errorf("proto: invalid field len = %d for field Values", pos-startPos) } case proto.WireTypeVarint: var num uint64 @@ -369,21 +381,10 @@ func (orig *Sample) UnmarshalProto(buf []byte) error { if err != nil { return err } - orig.AttributeIndices = append(orig.AttributeIndices, int32(num)) + orig.Values = append(orig.Values, int64(num)) default: - return fmt.Errorf("proto: wrong wireType = %d for field AttributeIndices", wireType) - } - - case 4: - if wireType != proto.WireTypeVarint { - return fmt.Errorf("proto: wrong wireType = %d for field LinkIndex", wireType) - } - var num uint64 - num, pos, err = proto.ConsumeVarint(buf, pos) - if err != nil { - return err + return fmt.Errorf("proto: wrong wireType = %d for field Values", wireType) } - orig.LinkIndex = int32(num) case 5: switch wireType { case proto.WireTypeLen: @@ -429,9 +430,9 @@ func (orig *Sample) UnmarshalProto(buf []byte) error { func GenTestSample() *Sample { orig := NewSample() orig.StackIndex = int32(13) - orig.Values = []int64{int64(0), int64(13)} orig.AttributeIndices = []int32{int32(0), int32(13)} orig.LinkIndex = int32(13) + orig.Values = []int64{int64(0), int64(13)} orig.TimestampsUnixNano = []uint64{uint64(0), uint64(13)} return orig } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_scopelogs.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_scopelogs.go index 606af0ffd..0a04cfdd3 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_scopelogs.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_scopelogs.go @@ -11,6 +11,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -30,7 +31,7 @@ var ( ) func NewScopeLogs() *ScopeLogs { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &ScopeLogs{} } return protoPoolScopeLogs.Get().(*ScopeLogs) @@ -41,7 +42,7 @@ func DeleteScopeLogs(orig *ScopeLogs, nullable bool) { return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_scopemetrics.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_scopemetrics.go index 5c7a9d1d5..957d10305 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_scopemetrics.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_scopemetrics.go @@ -11,6 +11,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -30,7 +31,7 @@ var ( ) func NewScopeMetrics() *ScopeMetrics { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &ScopeMetrics{} } return protoPoolScopeMetrics.Get().(*ScopeMetrics) @@ -41,7 +42,7 @@ func DeleteScopeMetrics(orig *ScopeMetrics, nullable bool) { return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_scopeprofiles.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_scopeprofiles.go index b88f3b1e1..ca13dbc36 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_scopeprofiles.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_scopeprofiles.go @@ -11,6 +11,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -30,7 +31,7 @@ var ( ) func NewScopeProfiles() *ScopeProfiles { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &ScopeProfiles{} } return protoPoolScopeProfiles.Get().(*ScopeProfiles) @@ -41,7 +42,7 @@ func DeleteScopeProfiles(orig *ScopeProfiles, nullable bool) { return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_scopespans.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_scopespans.go index 6a1966527..85e4fae2d 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_scopespans.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_scopespans.go @@ -11,6 +11,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -30,7 +31,7 @@ var ( ) func NewScopeSpans() *ScopeSpans { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &ScopeSpans{} } return protoPoolScopeSpans.Get().(*ScopeSpans) @@ -41,7 +42,7 @@ func DeleteScopeSpans(orig *ScopeSpans, nullable bool) { return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_span.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_span.go index 4df8e982e..32dbe4f3c 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_span.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_span.go @@ -12,6 +12,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -45,7 +46,7 @@ var ( ) func NewSpan() *Span { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &Span{} } return protoPoolSpan.Get().(*Span) @@ -56,7 +57,7 @@ func DeleteSpan(orig *Span, nullable bool) { return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_spancontext.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_spancontext.go index 2861cf117..e63b8ef49 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_spancontext.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_spancontext.go @@ -12,6 +12,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -32,7 +33,7 @@ var ( ) func NewSpanContext() *SpanContext { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &SpanContext{} } return protoPoolSpanContext.Get().(*SpanContext) @@ -43,7 +44,7 @@ func DeleteSpanContext(orig *SpanContext, nullable bool) { return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_spanevent.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_spanevent.go index 56d1ea50b..269aee7d9 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_spanevent.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_spanevent.go @@ -12,6 +12,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -33,7 +34,7 @@ var ( ) func NewSpanEvent() *SpanEvent { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &SpanEvent{} } return protoPoolSpanEvent.Get().(*SpanEvent) @@ -44,7 +45,7 @@ func DeleteSpanEvent(orig *SpanEvent, nullable bool) { return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_spanlink.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_spanlink.go index a7f8a670d..ee2ccfa06 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_spanlink.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_spanlink.go @@ -12,6 +12,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -36,7 +37,7 @@ var ( ) func NewSpanLink() *SpanLink { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &SpanLink{} } return protoPoolSpanLink.Get().(*SpanLink) @@ -47,7 +48,7 @@ func DeleteSpanLink(orig *SpanLink, nullable bool) { return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_stack.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_stack.go index be7a4ce48..90bf79fa2 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_stack.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_stack.go @@ -11,6 +11,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -29,7 +30,7 @@ var ( ) func NewStack() *Stack { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &Stack{} } return protoPoolStack.Get().(*Stack) @@ -40,7 +41,7 @@ func DeleteStack(orig *Stack, nullable bool) { return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_status.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_status.go index 77b5fe392..35ae797c9 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_status.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_status.go @@ -11,6 +11,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -30,7 +31,7 @@ var ( ) func NewStatus() *Status { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &Status{} } return protoPoolStatus.Get().(*Status) @@ -41,7 +42,7 @@ func DeleteStatus(orig *Status, nullable bool) { return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_sum.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_sum.go index f419344b5..d0c601ee8 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_sum.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_sum.go @@ -11,6 +11,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -30,7 +31,7 @@ var ( ) func NewSum() *Sum { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &Sum{} } return protoPoolSum.Get().(*Sum) @@ -41,7 +42,7 @@ func DeleteSum(orig *Sum, nullable bool) { return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_summary.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_summary.go index 5523e5af8..0b62ef765 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_summary.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_summary.go @@ -11,6 +11,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -28,7 +29,7 @@ var ( ) func NewSummary() *Summary { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &Summary{} } return protoPoolSummary.Get().(*Summary) @@ -39,7 +40,7 @@ func DeleteSummary(orig *Summary, nullable bool) { return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_summarydatapoint.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_summarydatapoint.go index ccd99fa18..5402264ee 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_summarydatapoint.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_summarydatapoint.go @@ -13,6 +13,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -36,7 +37,7 @@ var ( ) func NewSummaryDataPoint() *SummaryDataPoint { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &SummaryDataPoint{} } return protoPoolSummaryDataPoint.Get().(*SummaryDataPoint) @@ -47,7 +48,7 @@ func DeleteSummaryDataPoint(orig *SummaryDataPoint, nullable bool) { return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_summarydatapointvalueatquantile.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_summarydatapointvalueatquantile.go index 3b10b8a9c..a2910b738 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_summarydatapointvalueatquantile.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_summarydatapointvalueatquantile.go @@ -13,6 +13,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -31,7 +32,7 @@ var ( ) func NewSummaryDataPointValueAtQuantile() *SummaryDataPointValueAtQuantile { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &SummaryDataPointValueAtQuantile{} } return protoPoolSummaryDataPointValueAtQuantile.Get().(*SummaryDataPointValueAtQuantile) @@ -42,7 +43,7 @@ func DeleteSummaryDataPointValueAtQuantile(orig *SummaryDataPointValueAtQuantile return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_tcpaddr.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_tcpaddr.go index 08c350ffe..5392f07d0 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_tcpaddr.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_tcpaddr.go @@ -11,6 +11,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -29,7 +30,7 @@ var ( ) func NewTCPAddr() *TCPAddr { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &TCPAddr{} } return protoPoolTCPAddr.Get().(*TCPAddr) @@ -40,7 +41,7 @@ func DeleteTCPAddr(orig *TCPAddr, nullable bool) { return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_tracesdata.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_tracesdata.go index 2b54b6247..e81853de7 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_tracesdata.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_tracesdata.go @@ -11,6 +11,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -30,7 +31,7 @@ var ( ) func NewTracesData() *TracesData { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &TracesData{} } return protoPoolTracesData.Get().(*TracesData) @@ -41,7 +42,7 @@ func DeleteTracesData(orig *TracesData, nullable bool) { return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_tracesrequest.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_tracesrequest.go index b8bb39687..a54dedaef 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_tracesrequest.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_tracesrequest.go @@ -12,6 +12,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -30,7 +31,7 @@ var ( ) func NewTracesRequest() *TracesRequest { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &TracesRequest{} } return protoPoolTracesRequest.Get().(*TracesRequest) @@ -41,7 +42,7 @@ func DeleteTracesRequest(orig *TracesRequest, nullable bool) { return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_udpaddr.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_udpaddr.go index dd2883de5..efd539941 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_udpaddr.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_udpaddr.go @@ -11,6 +11,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -29,7 +30,7 @@ var ( ) func NewUDPAddr() *UDPAddr { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &UDPAddr{} } return protoPoolUDPAddr.Get().(*UDPAddr) @@ -40,7 +41,7 @@ func DeleteUDPAddr(orig *UDPAddr, nullable bool) { return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_unixaddr.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_unixaddr.go index be00bfbd3..c301df487 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_unixaddr.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_unixaddr.go @@ -11,6 +11,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -28,7 +29,7 @@ var ( ) func NewUnixAddr() *UnixAddr { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &UnixAddr{} } return protoPoolUnixAddr.Get().(*UnixAddr) @@ -39,7 +40,7 @@ func DeleteUnixAddr(orig *UnixAddr, nullable bool) { return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_valuetype.go b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_valuetype.go index eccd89e6e..676418994 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_valuetype.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/generated_proto_valuetype.go @@ -11,6 +11,7 @@ import ( "sync" "go.opentelemetry.io/collector/pdata/internal/json" + "go.opentelemetry.io/collector/pdata/internal/metadata" "go.opentelemetry.io/collector/pdata/internal/proto" ) @@ -29,7 +30,7 @@ var ( ) func NewValueType() *ValueType { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &ValueType{} } return protoPoolValueType.Get().(*ValueType) @@ -40,7 +41,7 @@ func DeleteValueType(orig *ValueType, nullable bool) { return } - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { orig.Reset() return } diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/metadata/generated_feature_gates.go b/vendor/go.opentelemetry.io/collector/pdata/internal/metadata/generated_feature_gates.go new file mode 100644 index 000000000..2fb2365cf --- /dev/null +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/metadata/generated_feature_gates.go @@ -0,0 +1,24 @@ +// Code generated by mdatagen. DO NOT EDIT. + +package metadata + +import ( + "go.opentelemetry.io/collector/featuregate" +) + +var PdataUseCustomProtoEncodingFeatureGate = featuregate.GlobalRegistry().MustRegister( + "pdata.useCustomProtoEncoding", + featuregate.StageStable, + featuregate.WithRegisterDescription("When enabled, enable custom proto encoding. This is a required step to enable featuregate pdata.useProtoPooling."), + featuregate.WithRegisterReferenceURL("https://github.com/open-telemetry/opentelemetry-collector/issues/13631"), + featuregate.WithRegisterFromVersion("v0.133.0"), + featuregate.WithRegisterToVersion("v0.137.0"), +) + +var PdataUseProtoPoolingFeatureGate = featuregate.GlobalRegistry().MustRegister( + "pdata.useProtoPooling", + featuregate.StageAlpha, + featuregate.WithRegisterDescription("When enabled, enable using local memory pools for underlying data that the pdata messages are pushed to."), + featuregate.WithRegisterReferenceURL("https://github.com/open-telemetry/opentelemetry-collector/issues/13631"), + featuregate.WithRegisterFromVersion("v0.133.0"), +) diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/state.go b/vendor/go.opentelemetry.io/collector/pdata/internal/state.go index 46f10722d..0e1b92185 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/state.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/state.go @@ -4,28 +4,9 @@ package internal // import "go.opentelemetry.io/collector/pdata/internal" import ( "sync/atomic" - - "go.opentelemetry.io/collector/featuregate" -) - -var _ = featuregate.GlobalRegistry().MustRegister( - "pdata.useCustomProtoEncoding", - featuregate.StageStable, - featuregate.WithRegisterDescription("When enabled, enable custom proto encoding. This is required step to enable featuregate pdata.useProtoPooling."), - featuregate.WithRegisterReferenceURL("https://github.com/open-telemetry/opentelemetry-collector/issues/13631"), - featuregate.WithRegisterFromVersion("v0.133.0"), - featuregate.WithRegisterToVersion("v0.137.0"), -) - -var UseProtoPooling = featuregate.GlobalRegistry().MustRegister( - "pdata.useProtoPooling", - featuregate.StageAlpha, - featuregate.WithRegisterDescription("When enabled, enable using local memory pools for underlying data that the pdata messages are pushed to."), - featuregate.WithRegisterReferenceURL("https://github.com/open-telemetry/opentelemetry-collector/issues/13631"), - featuregate.WithRegisterFromVersion("v0.133.0"), ) -// State defines an ownership state of pmetric.Metrics, plog.Logs or ptrace.Traces. +// State defines an ownership state of pmetric.Metrics, plog.Logs, ptrace.Traces or pprofile.Profiles. type State struct { refs atomic.Int32 state uint32 diff --git a/vendor/go.opentelemetry.io/collector/pdata/internal/wrapper_value.go b/vendor/go.opentelemetry.io/collector/pdata/internal/wrapper_value.go index c0220c8f0..1471d858b 100644 --- a/vendor/go.opentelemetry.io/collector/pdata/internal/wrapper_value.go +++ b/vendor/go.opentelemetry.io/collector/pdata/internal/wrapper_value.go @@ -3,6 +3,8 @@ package internal // import "go.opentelemetry.io/collector/pdata/internal" +import "go.opentelemetry.io/collector/pdata/internal/metadata" + type ValueWrapper struct { orig *AnyValue state *State @@ -26,49 +28,49 @@ func GenTestValueWrapper() ValueWrapper { } func NewAnyValueStringValue() *AnyValue_StringValue { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &AnyValue_StringValue{} } return ProtoPoolAnyValue_StringValue.Get().(*AnyValue_StringValue) } func NewAnyValueIntValue() *AnyValue_IntValue { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &AnyValue_IntValue{} } return ProtoPoolAnyValue_IntValue.Get().(*AnyValue_IntValue) } func NewAnyValueBoolValue() *AnyValue_BoolValue { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &AnyValue_BoolValue{} } return ProtoPoolAnyValue_BoolValue.Get().(*AnyValue_BoolValue) } func NewAnyValueDoubleValue() *AnyValue_DoubleValue { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &AnyValue_DoubleValue{} } return ProtoPoolAnyValue_DoubleValue.Get().(*AnyValue_DoubleValue) } func NewAnyValueBytesValue() *AnyValue_BytesValue { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &AnyValue_BytesValue{} } return ProtoPoolAnyValue_BytesValue.Get().(*AnyValue_BytesValue) } func NewAnyValueArrayValue() *AnyValue_ArrayValue { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &AnyValue_ArrayValue{} } return ProtoPoolAnyValue_ArrayValue.Get().(*AnyValue_ArrayValue) } func NewAnyValueKvlistValue() *AnyValue_KvlistValue { - if !UseProtoPooling.IsEnabled() { + if !metadata.PdataUseProtoPoolingFeatureGate.IsEnabled() { return &AnyValue_KvlistValue{} } return ProtoPoolAnyValue_KvlistValue.Get().(*AnyValue_KvlistValue) diff --git a/vendor/go.opentelemetry.io/proto/otlp/common/v1/common.pb.go b/vendor/go.opentelemetry.io/proto/otlp/common/v1/common.pb.go index 1f8d49bc9..304f64763 100644 --- a/vendor/go.opentelemetry.io/proto/otlp/common/v1/common.pb.go +++ b/vendor/go.opentelemetry.io/proto/otlp/common/v1/common.pb.go @@ -53,6 +53,7 @@ type AnyValue struct { // *AnyValue_ArrayValue // *AnyValue_KvlistValue // *AnyValue_BytesValue + // *AnyValue_StringValueStrindex Value isAnyValue_Value `protobuf_oneof:"value"` } @@ -144,6 +145,13 @@ func (x *AnyValue) GetBytesValue() []byte { return nil } +func (x *AnyValue) GetStringValueStrindex() int32 { + if x, ok := x.GetValue().(*AnyValue_StringValueStrindex); ok { + return x.StringValueStrindex + } + return 0 +} + type isAnyValue_Value interface { isAnyValue_Value() } @@ -176,6 +184,20 @@ type AnyValue_BytesValue struct { BytesValue []byte `protobuf:"bytes,7,opt,name=bytes_value,json=bytesValue,proto3,oneof"` } +type AnyValue_StringValueStrindex struct { + // Reference to the string value in ProfilesDictionary.string_table. + // + // Note: This is currently used exclusively in the Profiling signal. + // Implementers of OTLP receivers for signals other than Profiling should + // treat the presence of this value as a non-fatal issue. + // Log an error or warning indicating an unexpected field intended for the + // Profiling signal and process the data as if this value were absent or + // empty, ignoring its semantic content for the non-Profiling signal. + // + // Status: [Development] + StringValueStrindex int32 `protobuf:"varint,8,opt,name=string_value_strindex,json=stringValueStrindex,proto3,oneof"` +} + func (*AnyValue_StringValue) isAnyValue_Value() {} func (*AnyValue_BoolValue) isAnyValue_Value() {} @@ -190,6 +212,8 @@ func (*AnyValue_KvlistValue) isAnyValue_Value() {} func (*AnyValue_BytesValue) isAnyValue_Value() {} +func (*AnyValue_StringValueStrindex) isAnyValue_Value() {} + // ArrayValue is a list of AnyValue messages. We need ArrayValue as a message // since oneof in AnyValue does not allow repeated fields. type ArrayValue struct { @@ -306,9 +330,22 @@ type KeyValue struct { unknownFields protoimpl.UnknownFields // The key name of the pair. + // key_ref MUST NOT be set if key is used. Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` // The value of the pair. Value *AnyValue `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` + // Reference to the string key in ProfilesDictionary.string_table. + // key MUST NOT be set if key_strindex is used. + // + // Note: This is currently used exclusively in the Profiling signal. + // Implementers of OTLP receivers for signals other than Profiling should + // treat the presence of this key as a non-fatal issue. + // Log an error or warning indicating an unexpected field intended for the + // Profiling signal and process the data as if this value were absent or + // empty, ignoring its semantic content for the non-Profiling signal. + // + // Status: [Development] + KeyStrindex int32 `protobuf:"varint,3,opt,name=key_strindex,json=keyStrindex,proto3" json:"key_strindex,omitempty"` } func (x *KeyValue) Reset() { @@ -357,6 +394,13 @@ func (x *KeyValue) GetValue() *AnyValue { return nil } +func (x *KeyValue) GetKeyStrindex() int32 { + if x != nil { + return x.KeyStrindex + } + return 0 +} + // InstrumentationScope is a message representing the instrumentation scope information // such as the fully qualified name and version. type InstrumentationScope struct { @@ -543,7 +587,7 @@ var file_opentelemetry_proto_common_v1_common_proto_rawDesc = []byte{ 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x1d, 0x6f, 0x70, 0x65, 0x6e, 0x74, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x74, 0x72, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x22, 0xe0, 0x02, 0x0a, 0x08, + 0x6f, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x22, 0x96, 0x03, 0x0a, 0x08, 0x41, 0x6e, 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x23, 0x0a, 0x0c, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x0b, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1f, 0x0a, @@ -565,52 +609,58 @@ var file_opentelemetry_proto_common_v1_common_proto_rawDesc = []byte{ 0x69, 0x73, 0x74, 0x48, 0x00, 0x52, 0x0b, 0x6b, 0x76, 0x6c, 0x69, 0x73, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x21, 0x0a, 0x0b, 0x62, 0x79, 0x74, 0x65, 0x73, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0c, 0x48, 0x00, 0x52, 0x0a, 0x62, 0x79, 0x74, 0x65, 0x73, - 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x07, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x4d, - 0x0a, 0x0a, 0x41, 0x72, 0x72, 0x61, 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x3f, 0x0a, 0x06, - 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x6f, - 0x70, 0x65, 0x6e, 0x74, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x74, 0x72, 0x79, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x6e, 0x79, - 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x06, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x22, 0x4f, 0x0a, - 0x0c, 0x4b, 0x65, 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x3f, 0x0a, - 0x06, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, - 0x6f, 0x70, 0x65, 0x6e, 0x74, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x74, 0x72, 0x79, 0x2e, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4b, 0x65, - 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x06, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x22, 0x5b, - 0x0a, 0x08, 0x4b, 0x65, 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, - 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x3d, 0x0a, 0x05, - 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x6f, 0x70, - 0x65, 0x6e, 0x74, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x74, 0x72, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x6e, 0x79, 0x56, - 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0xc7, 0x01, 0x0a, 0x14, - 0x49, 0x6e, 0x73, 0x74, 0x72, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, - 0x63, 0x6f, 0x70, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, - 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, - 0x6f, 0x6e, 0x12, 0x47, 0x0a, 0x0a, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, - 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x74, 0x65, 0x6c, - 0x65, 0x6d, 0x65, 0x74, 0x72, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x63, 0x6f, 0x6d, - 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4b, 0x65, 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, - 0x0a, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x12, 0x38, 0x0a, 0x18, 0x64, - 0x72, 0x6f, 0x70, 0x70, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, - 0x73, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x16, 0x64, - 0x72, 0x6f, 0x70, 0x70, 0x65, 0x64, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, - 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x82, 0x01, 0x0a, 0x09, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, - 0x52, 0x65, 0x66, 0x12, 0x1d, 0x0a, 0x0a, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x5f, 0x75, 0x72, - 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x55, - 0x72, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x17, 0x0a, 0x07, 0x69, 0x64, 0x5f, 0x6b, 0x65, 0x79, - 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x69, 0x64, 0x4b, 0x65, 0x79, 0x73, 0x12, - 0x29, 0x0a, 0x10, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6b, - 0x65, 0x79, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0f, 0x64, 0x65, 0x73, 0x63, 0x72, - 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x4b, 0x65, 0x79, 0x73, 0x42, 0x7b, 0x0a, 0x20, 0x69, 0x6f, - 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x74, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x74, 0x72, 0x79, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x42, 0x0b, - 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x28, 0x67, - 0x6f, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x74, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x74, 0x72, 0x79, 0x2e, - 0x69, 0x6f, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6f, 0x74, 0x6c, 0x70, 0x2f, 0x63, 0x6f, - 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x76, 0x31, 0xaa, 0x02, 0x1d, 0x4f, 0x70, 0x65, 0x6e, 0x54, 0x65, - 0x6c, 0x65, 0x6d, 0x65, 0x74, 0x72, 0x79, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x43, 0x6f, - 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x34, 0x0a, 0x15, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x5f, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x08, + 0x20, 0x01, 0x28, 0x05, 0x48, 0x00, 0x52, 0x13, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x56, 0x61, + 0x6c, 0x75, 0x65, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x42, 0x07, 0x0a, 0x05, 0x76, + 0x61, 0x6c, 0x75, 0x65, 0x22, 0x4d, 0x0a, 0x0a, 0x41, 0x72, 0x72, 0x61, 0x79, 0x56, 0x61, 0x6c, + 0x75, 0x65, 0x12, 0x3f, 0x0a, 0x06, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x74, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x74, + 0x72, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, + 0x76, 0x31, 0x2e, 0x41, 0x6e, 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x06, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x73, 0x22, 0x4f, 0x0a, 0x0c, 0x4b, 0x65, 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4c, + 0x69, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x06, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x18, 0x01, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x74, 0x65, 0x6c, 0x65, 0x6d, 0x65, + 0x74, 0x72, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, + 0x2e, 0x76, 0x31, 0x2e, 0x4b, 0x65, 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x06, 0x76, 0x61, + 0x6c, 0x75, 0x65, 0x73, 0x22, 0x7e, 0x0a, 0x08, 0x4b, 0x65, 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65, + 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, + 0x65, 0x79, 0x12, 0x3d, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x27, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x74, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x74, 0x72, + 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, + 0x31, 0x2e, 0x41, 0x6e, 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, + 0x65, 0x12, 0x21, 0x0a, 0x0c, 0x6b, 0x65, 0x79, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x64, 0x65, + 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x6b, 0x65, 0x79, 0x53, 0x74, 0x72, 0x69, + 0x6e, 0x64, 0x65, 0x78, 0x22, 0xc7, 0x01, 0x0a, 0x14, 0x49, 0x6e, 0x73, 0x74, 0x72, 0x75, 0x6d, + 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x12, 0x12, 0x0a, + 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, + 0x65, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x47, 0x0a, 0x0a, 0x61, + 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x27, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x74, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x74, 0x72, 0x79, 0x2e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, + 0x4b, 0x65, 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x0a, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x73, 0x12, 0x38, 0x0a, 0x18, 0x64, 0x72, 0x6f, 0x70, 0x70, 0x65, 0x64, 0x5f, + 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, + 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x16, 0x64, 0x72, 0x6f, 0x70, 0x70, 0x65, 0x64, 0x41, + 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x82, + 0x01, 0x0a, 0x09, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x52, 0x65, 0x66, 0x12, 0x1d, 0x0a, 0x0a, + 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x5f, 0x75, 0x72, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x09, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x55, 0x72, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x74, + 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, + 0x17, 0x0a, 0x07, 0x69, 0x64, 0x5f, 0x6b, 0x65, 0x79, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, + 0x52, 0x06, 0x69, 0x64, 0x4b, 0x65, 0x79, 0x73, 0x12, 0x29, 0x0a, 0x10, 0x64, 0x65, 0x73, 0x63, + 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6b, 0x65, 0x79, 0x73, 0x18, 0x04, 0x20, 0x03, + 0x28, 0x09, 0x52, 0x0f, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x4b, + 0x65, 0x79, 0x73, 0x42, 0x7b, 0x0a, 0x20, 0x69, 0x6f, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x74, 0x65, + 0x6c, 0x65, 0x6d, 0x65, 0x74, 0x72, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x63, 0x6f, + 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x42, 0x0b, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x28, 0x67, 0x6f, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x74, + 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x74, 0x72, 0x79, 0x2e, 0x69, 0x6f, 0x2f, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x2f, 0x6f, 0x74, 0x6c, 0x70, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x76, 0x31, + 0xaa, 0x02, 0x1d, 0x4f, 0x70, 0x65, 0x6e, 0x54, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x74, 0x72, 0x79, + 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x56, 0x31, + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -735,6 +785,7 @@ func file_opentelemetry_proto_common_v1_common_proto_init() { (*AnyValue_ArrayValue)(nil), (*AnyValue_KvlistValue)(nil), (*AnyValue_BytesValue)(nil), + (*AnyValue_StringValueStrindex)(nil), } type x struct{} out := protoimpl.TypeBuilder{ diff --git a/vendor/golang.org/x/crypto/ssh/agent/server.go b/vendor/golang.org/x/crypto/ssh/agent/server.go index 4e8ff86b6..2a7658cf7 100644 --- a/vendor/golang.org/x/crypto/ssh/agent/server.go +++ b/vendor/golang.org/x/crypto/ssh/agent/server.go @@ -36,7 +36,7 @@ func (s *server) processRequestBytes(reqData []byte) []byte { return []byte{agentFailure} } - if err == nil && rep == nil { + if rep == nil { return []byte{agentSuccess} } diff --git a/vendor/golang.org/x/net/http2/http2.go b/vendor/golang.org/x/net/http2/http2.go index 6320f4eb4..0b99d832f 100644 --- a/vendor/golang.org/x/net/http2/http2.go +++ b/vendor/golang.org/x/net/http2/http2.go @@ -4,13 +4,17 @@ // Package http2 implements the HTTP/2 protocol. // -// This package is low-level and intended to be used directly by very -// few people. Most users will use it indirectly through the automatic -// use by the net/http package (from Go 1.6 and later). -// For use in earlier Go versions see ConfigureServer. (Transport support -// requires Go 1.6 or later) +// Almost no users should need to import this package directly. +// The net/http package supports HTTP/2 natively. // -// See https://http2.github.io/ for more information on HTTP/2. +// To enable or disable HTTP/2 support in net/http clients and servers, see +// [http.Transport.Protocols] and [http.Server.Protocols]. +// +// To configure HTTP/2 parameters, see +// [http.Transport.HTTP2] and [http.Server.HTTP2]. +// +// To create HTTP/1 or HTTP/2 connections, see +// [http.Transport.NewClientConn]. package http2 // import "golang.org/x/net/http2" import ( diff --git a/vendor/golang.org/x/net/http2/server.go b/vendor/golang.org/x/net/http2/server.go index 7ef807f79..65da5175c 100644 --- a/vendor/golang.org/x/net/http2/server.go +++ b/vendor/golang.org/x/net/http2/server.go @@ -164,6 +164,8 @@ type Server struct { // NewWriteScheduler constructs a write scheduler for a connection. // If nil, a default scheduler is chosen. + // + // Deprecated: User-provided write schedulers are deprecated. NewWriteScheduler func() WriteScheduler // CountError, if non-nil, is called on HTTP/2 server errors. diff --git a/vendor/golang.org/x/net/http2/transport.go b/vendor/golang.org/x/net/http2/transport.go index 8cf64b78e..2e9c2f6a5 100644 --- a/vendor/golang.org/x/net/http2/transport.go +++ b/vendor/golang.org/x/net/http2/transport.go @@ -712,10 +712,6 @@ func canRetryError(err error) bool { return true } if se, ok := err.(StreamError); ok { - if se.Code == ErrCodeProtocol && se.Cause == errFromPeer { - // See golang/go#47635, golang/go#42777 - return true - } return se.Code == ErrCodeRefusedStream } return false @@ -3233,10 +3229,6 @@ func (gz *gzipReader) Close() error { return gz.body.Close() } -type errorReader struct{ err error } - -func (r errorReader) Read(p []byte) (int, error) { return 0, r.err } - // isConnectionCloseRequest reports whether req should use its own // connection for a single request and then close the connection. func isConnectionCloseRequest(req *http.Request) bool { diff --git a/vendor/golang.org/x/net/http2/writesched.go b/vendor/golang.org/x/net/http2/writesched.go index 7de27be52..551545f31 100644 --- a/vendor/golang.org/x/net/http2/writesched.go +++ b/vendor/golang.org/x/net/http2/writesched.go @@ -8,6 +8,8 @@ import "fmt" // WriteScheduler is the interface implemented by HTTP/2 write schedulers. // Methods are never called concurrently. +// +// Deprecated: User-provided write schedulers are deprecated. type WriteScheduler interface { // OpenStream opens a new stream in the write scheduler. // It is illegal to call this with streamID=0 or with a streamID that is @@ -38,6 +40,8 @@ type WriteScheduler interface { } // OpenStreamOptions specifies extra options for WriteScheduler.OpenStream. +// +// Deprecated: User-provided write schedulers are deprecated. type OpenStreamOptions struct { // PusherID is zero if the stream was initiated by the client. Otherwise, // PusherID names the stream that pushed the newly opened stream. @@ -47,6 +51,8 @@ type OpenStreamOptions struct { } // FrameWriteRequest is a request to write a frame. +// +// Deprecated: User-provided write schedulers are deprecated. type FrameWriteRequest struct { // write is the interface value that does the writing, once the // WriteScheduler has selected this frame to write. The write diff --git a/vendor/golang.org/x/net/http2/writesched_priority_rfc7540.go b/vendor/golang.org/x/net/http2/writesched_priority_rfc7540.go index 7803a9261..c3d3e9bed 100644 --- a/vendor/golang.org/x/net/http2/writesched_priority_rfc7540.go +++ b/vendor/golang.org/x/net/http2/writesched_priority_rfc7540.go @@ -14,6 +14,8 @@ import ( const priorityDefaultWeightRFC7540 = 15 // 16 = 15 + 1 // PriorityWriteSchedulerConfig configures a priorityWriteScheduler. +// +// Deprecated: User-provided write schedulers are deprecated. type PriorityWriteSchedulerConfig struct { // MaxClosedNodesInTree controls the maximum number of closed streams to // retain in the priority tree. Setting this to zero saves a small amount @@ -55,6 +57,9 @@ type PriorityWriteSchedulerConfig struct { // NewPriorityWriteScheduler constructs a WriteScheduler that schedules // frames by following HTTP/2 priorities as described in RFC 7540 Section 5.3. // If cfg is nil, default options are used. +// +// Deprecated: The RFC 7540 write scheduler has known bugs and performance issues, +// and RFC 7540 prioritization was deprecated in RFC 9113. func NewPriorityWriteScheduler(cfg *PriorityWriteSchedulerConfig) WriteScheduler { return newPriorityWriteSchedulerRFC7540(cfg) } diff --git a/vendor/golang.org/x/net/http2/writesched_random.go b/vendor/golang.org/x/net/http2/writesched_random.go index f2e55e05c..d5d4e2214 100644 --- a/vendor/golang.org/x/net/http2/writesched_random.go +++ b/vendor/golang.org/x/net/http2/writesched_random.go @@ -10,6 +10,8 @@ import "math" // priorities. Control frames like SETTINGS and PING are written before DATA // frames, but if no control frames are queued and multiple streams have queued // HEADERS or DATA frames, Pop selects a ready stream arbitrarily. +// +// Deprecated: User-provided write schedulers are deprecated. func NewRandomWriteScheduler() WriteScheduler { return &randomWriteScheduler{sq: make(map[uint32]*writeQueue)} } diff --git a/vendor/golang.org/x/tools/go/packages/golist.go b/vendor/golang.org/x/tools/go/packages/golist.go index 680a70ca8..a6c17cf63 100644 --- a/vendor/golang.org/x/tools/go/packages/golist.go +++ b/vendor/golang.org/x/tools/go/packages/golist.go @@ -61,13 +61,42 @@ func (r *responseDeduper) addAll(dr *DriverResponse) { } func (r *responseDeduper) addPackage(p *Package) { - if r.seenPackages[p.ID] != nil { + if prev := r.seenPackages[p.ID]; prev != nil { + // Package already seen in a previous response. Merge the file lists, + // removing duplicates. This can happen when the same package appears + // in multiple driver responses that are being merged together. + prev.GoFiles = appendUniqueStrings(prev.GoFiles, p.GoFiles) + prev.CompiledGoFiles = appendUniqueStrings(prev.CompiledGoFiles, p.CompiledGoFiles) + prev.OtherFiles = appendUniqueStrings(prev.OtherFiles, p.OtherFiles) + prev.IgnoredFiles = appendUniqueStrings(prev.IgnoredFiles, p.IgnoredFiles) + prev.EmbedFiles = appendUniqueStrings(prev.EmbedFiles, p.EmbedFiles) + prev.EmbedPatterns = appendUniqueStrings(prev.EmbedPatterns, p.EmbedPatterns) return } r.seenPackages[p.ID] = p r.dr.Packages = append(r.dr.Packages, p) } +// appendUniqueStrings appends elements from src to dst, skipping duplicates. +func appendUniqueStrings(dst, src []string) []string { + if len(src) == 0 { + return dst + } + + seen := make(map[string]bool, len(dst)) + for _, s := range dst { + seen[s] = true + } + + for _, s := range src { + if !seen[s] { + dst = append(dst, s) + } + } + + return dst +} + func (r *responseDeduper) addRoot(id string) { if r.seenRoots[id] { return @@ -832,6 +861,8 @@ func golistargs(cfg *Config, words []string, goVersion int) []string { // go list doesn't let you pass -test and -find together, // probably because you'd just get the TestMain. fmt.Sprintf("-find=%t", !cfg.Tests && cfg.Mode&findFlags == 0 && !usesExportData(cfg)), + // VCS information is not needed when not printing Stale or StaleReason fields + "-buildvcs=false", } // golang/go#60456: with go1.21 and later, go list serves pgo variants, which diff --git a/vendor/golang.org/x/tools/go/packages/packages.go b/vendor/golang.org/x/tools/go/packages/packages.go index b249a5c7e..412ba06b5 100644 --- a/vendor/golang.org/x/tools/go/packages/packages.go +++ b/vendor/golang.org/x/tools/go/packages/packages.go @@ -403,6 +403,10 @@ func mergeResponses(responses ...*DriverResponse) *DriverResponse { if len(responses) == 0 { return nil } + // No dedup needed + if len(responses) == 1 { + return responses[0] + } response := newDeduper() response.dr.NotHandled = false response.dr.Compiler = responses[0].Compiler diff --git a/vendor/modules.txt b/vendor/modules.txt index b3555eb07..01ae832c6 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -128,7 +128,7 @@ github.com/aws/amazon-ec2-instance-selector/v3/pkg/instancetypes github.com/aws/amazon-ec2-instance-selector/v3/pkg/selector github.com/aws/amazon-ec2-instance-selector/v3/pkg/selector/outputs github.com/aws/amazon-ec2-instance-selector/v3/pkg/sorter -# github.com/aws/aws-sdk-go-v2 v1.41.3 +# github.com/aws/aws-sdk-go-v2 v1.41.4 ## explicit; go 1.24 github.com/aws/aws-sdk-go-v2/aws github.com/aws/aws-sdk-go-v2/aws/arn @@ -156,7 +156,7 @@ github.com/aws/aws-sdk-go-v2/internal/shareddefaults github.com/aws/aws-sdk-go-v2/internal/strings github.com/aws/aws-sdk-go-v2/internal/sync/singleflight github.com/aws/aws-sdk-go-v2/internal/timeconv -# github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.6 +# github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.7 ## explicit; go 1.24 github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream/eventstreamapi @@ -177,16 +177,16 @@ github.com/aws/aws-sdk-go-v2/credentials/stscreds ## explicit; go 1.24 github.com/aws/aws-sdk-go-v2/feature/ec2/imds github.com/aws/aws-sdk-go-v2/feature/ec2/imds/internal/config -# github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.19 +# github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.20 ## explicit; go 1.24 github.com/aws/aws-sdk-go-v2/internal/configsources -# github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.19 +# github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.20 ## explicit; go 1.24 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 # github.com/aws/aws-sdk-go-v2/internal/ini v1.8.5 ## explicit; go 1.24 github.com/aws/aws-sdk-go-v2/internal/ini -# github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.20 +# github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.21 ## explicit; go 1.24 github.com/aws/aws-sdk-go-v2/internal/v4a github.com/aws/aws-sdk-go-v2/internal/v4a/internal/crypto @@ -196,7 +196,7 @@ github.com/aws/aws-sdk-go-v2/internal/v4a/internal/v4 github.com/aws/aws-sdk-go-v2/service/ec2 github.com/aws/aws-sdk-go-v2/service/ec2/internal/endpoints github.com/aws/aws-sdk-go-v2/service/ec2/types -# github.com/aws/aws-sdk-go-v2/service/ecs v1.73.1 +# github.com/aws/aws-sdk-go-v2/service/ecs v1.74.0 ## explicit; go 1.24 github.com/aws/aws-sdk-go-v2/service/ecs github.com/aws/aws-sdk-go-v2/service/ecs/document @@ -208,16 +208,16 @@ github.com/aws/aws-sdk-go-v2/service/ecs/types github.com/aws/aws-sdk-go-v2/service/iam github.com/aws/aws-sdk-go-v2/service/iam/internal/endpoints github.com/aws/aws-sdk-go-v2/service/iam/types -# github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.6 +# github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.7 ## explicit; go 1.24 github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding -# github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.11 +# github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.12 ## explicit; go 1.24 github.com/aws/aws-sdk-go-v2/service/internal/checksum -# github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.19 +# github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.20 ## explicit; go 1.24 github.com/aws/aws-sdk-go-v2/service/internal/presigned-url -# github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.19 +# github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.20 ## explicit; go 1.24 github.com/aws/aws-sdk-go-v2/service/internal/s3shared github.com/aws/aws-sdk-go-v2/service/internal/s3shared/arn @@ -227,7 +227,7 @@ github.com/aws/aws-sdk-go-v2/service/internal/s3shared/config github.com/aws/aws-sdk-go-v2/service/pricing github.com/aws/aws-sdk-go-v2/service/pricing/internal/endpoints github.com/aws/aws-sdk-go-v2/service/pricing/types -# github.com/aws/aws-sdk-go-v2/service/s3 v1.96.4 +# github.com/aws/aws-sdk-go-v2/service/s3 v1.97.1 ## explicit; go 1.24 github.com/aws/aws-sdk-go-v2/service/s3 github.com/aws/aws-sdk-go-v2/service/s3/internal/arn @@ -654,7 +654,7 @@ github.com/pkg/term/termios github.com/pulumi/appdash github.com/pulumi/appdash/internal/wire github.com/pulumi/appdash/opentracing -# github.com/pulumi/esc v0.22.0 +# github.com/pulumi/esc v0.23.0 ## explicit; go 1.24.7 github.com/pulumi/esc github.com/pulumi/esc/ast @@ -671,8 +671,8 @@ github.com/pulumi/pulumi-aws-native/sdk/go/aws github.com/pulumi/pulumi-aws-native/sdk/go/aws/internal github.com/pulumi/pulumi-aws-native/sdk/go/aws/scheduler github.com/pulumi/pulumi-aws-native/sdk/go/aws/ssm -# github.com/pulumi/pulumi-aws/sdk/v7 v7.21.0 -## explicit; go 1.24.0 +# github.com/pulumi/pulumi-aws/sdk/v7 v7.23.0 +## explicit; go 1.25.6 github.com/pulumi/pulumi-aws/sdk/v7/go/aws github.com/pulumi/pulumi-aws/sdk/v7/go/aws/autoscaling github.com/pulumi/pulumi-aws/sdk/v7/go/aws/cloudwatch @@ -728,7 +728,7 @@ github.com/pulumi/pulumi-docker/sdk/v4/go/docker/internal ## explicit; go 1.22 github.com/pulumi/pulumi-gitlab/sdk/v8/go/gitlab github.com/pulumi/pulumi-gitlab/sdk/v8/go/gitlab/internal -# github.com/pulumi/pulumi-kubernetes/sdk/v4 v4.27.0 +# github.com/pulumi/pulumi-kubernetes/sdk/v4 v4.28.0 ## explicit; go 1.25.0 github.com/pulumi/pulumi-kubernetes/sdk/v4/go/kubernetes github.com/pulumi/pulumi-kubernetes/sdk/v4/go/kubernetes/admissionregistration/v1 @@ -806,7 +806,7 @@ github.com/pulumi/pulumi-random/sdk/v4/go/random/internal ## explicit; go 1.24.0 github.com/pulumi/pulumi-tls/sdk/v5/go/tls github.com/pulumi/pulumi-tls/sdk/v5/go/tls/internal -# github.com/pulumi/pulumi/sdk/v3 v3.225.1 +# github.com/pulumi/pulumi/sdk/v3 v3.226.0 ## explicit; go 1.25.6 github.com/pulumi/pulumi/sdk/v3 github.com/pulumi/pulumi/sdk/v3/go/auto @@ -966,13 +966,14 @@ github.com/zclconf/go-cty/cty/set ## explicit; go 1.24.0 go.opentelemetry.io/auto/sdk go.opentelemetry.io/auto/sdk/internal/telemetry -# go.opentelemetry.io/collector/featuregate v1.53.0 +# go.opentelemetry.io/collector/featuregate v1.54.0 ## explicit; go 1.25.0 go.opentelemetry.io/collector/featuregate -# go.opentelemetry.io/collector/pdata v1.53.0 +# go.opentelemetry.io/collector/pdata v1.54.0 ## explicit; go 1.25.0 go.opentelemetry.io/collector/pdata/internal go.opentelemetry.io/collector/pdata/internal/json +go.opentelemetry.io/collector/pdata/internal/metadata go.opentelemetry.io/collector/pdata/internal/otlp go.opentelemetry.io/collector/pdata/internal/proto go.opentelemetry.io/collector/pdata/pcommon @@ -1028,8 +1029,8 @@ go.opentelemetry.io/otel/trace go.opentelemetry.io/otel/trace/embedded go.opentelemetry.io/otel/trace/internal/telemetry go.opentelemetry.io/otel/trace/noop -# go.opentelemetry.io/proto/otlp v1.9.0 -## explicit; go 1.23.0 +# go.opentelemetry.io/proto/otlp v1.10.0 +## explicit; go 1.24.0 go.opentelemetry.io/proto/otlp/collector/trace/v1 go.opentelemetry.io/proto/otlp/common/v1 go.opentelemetry.io/proto/otlp/resource/v1 @@ -1046,8 +1047,8 @@ go.yaml.in/yaml/v2 # go.yaml.in/yaml/v3 v3.0.4 ## explicit; go 1.16 go.yaml.in/yaml/v3 -# golang.org/x/crypto v0.48.0 -## explicit; go 1.24.0 +# golang.org/x/crypto v0.49.0 +## explicit; go 1.25.0 golang.org/x/crypto/argon2 golang.org/x/crypto/blake2b golang.org/x/crypto/blowfish @@ -1067,14 +1068,14 @@ golang.org/x/crypto/ssh golang.org/x/crypto/ssh/agent golang.org/x/crypto/ssh/internal/bcrypt_pbkdf golang.org/x/crypto/ssh/knownhosts -# golang.org/x/exp v0.0.0-20260218203240-3dfff04db8fa +# golang.org/x/exp v0.0.0-20260312153236-7ab1446f8b90 ## explicit; go 1.25.0 golang.org/x/exp/maps golang.org/x/exp/slices -# golang.org/x/mod v0.33.0 -## explicit; go 1.24.0 +# golang.org/x/mod v0.34.0 +## explicit; go 1.25.0 golang.org/x/mod/semver -# golang.org/x/net v0.51.0 +# golang.org/x/net v0.52.0 ## explicit; go 1.25.0 golang.org/x/net/context golang.org/x/net/http/httpguts @@ -1102,11 +1103,11 @@ golang.org/x/sys/plan9 golang.org/x/sys/unix golang.org/x/sys/windows golang.org/x/sys/windows/registry -# golang.org/x/term v0.40.0 -## explicit; go 1.24.0 +# golang.org/x/term v0.41.0 +## explicit; go 1.25.0 golang.org/x/term -# golang.org/x/text v0.34.0 -## explicit; go 1.24.0 +# golang.org/x/text v0.35.0 +## explicit; go 1.25.0 golang.org/x/text/encoding golang.org/x/text/encoding/internal golang.org/x/text/encoding/internal/identifier @@ -1124,8 +1125,8 @@ golang.org/x/text/unicode/norm # golang.org/x/time v0.15.0 ## explicit; go 1.25.0 golang.org/x/time/rate -# golang.org/x/tools v0.42.0 -## explicit; go 1.24.0 +# golang.org/x/tools v0.43.0 +## explicit; go 1.25.0 golang.org/x/tools/cmd/stringer golang.org/x/tools/go/ast/edge golang.org/x/tools/go/ast/inspector @@ -1146,10 +1147,10 @@ golang.org/x/tools/internal/stdlib golang.org/x/tools/internal/typeparams golang.org/x/tools/internal/typesinternal golang.org/x/tools/internal/versions -# google.golang.org/genproto/googleapis/api v0.0.0-20260226221140-a57be14db171 +# google.golang.org/genproto/googleapis/api v0.0.0-20260316180232-0b37fe3546d5 ## explicit; go 1.25.0 google.golang.org/genproto/googleapis/api/httpbody -# google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171 +# google.golang.org/genproto/googleapis/rpc v0.0.0-20260316180232-0b37fe3546d5 ## explicit; go 1.25.0 google.golang.org/genproto/googleapis/rpc/errdetails google.golang.org/genproto/googleapis/rpc/status @@ -1357,7 +1358,7 @@ k8s.io/klog/v2/internal/dbg k8s.io/klog/v2/internal/serialize k8s.io/klog/v2/internal/severity k8s.io/klog/v2/internal/sloghandler -# k8s.io/kube-openapi v0.0.0-20260304202019-5b3e3fdb0acf +# k8s.io/kube-openapi v0.0.0-20260317180543-43fb72c5454a ## explicit; go 1.23.0 k8s.io/kube-openapi/pkg/util # k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2