From 62f4aa42715a8bd100a933439a5b2076a2c2046a Mon Sep 17 00:00:00 2001 From: Daniel Laszlo Date: Wed, 28 Jun 2023 16:25:57 +0200 Subject: [PATCH] fix: customizable tracer configuration (#7644) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: customizable tracer configuration Signed-off-by: Daniel Laszlo Signed-off-by: Daniel Laszlo * fix: harden rbac permissions (#7638) Signed-off-by: Charles-Edouard Brétéché Signed-off-by: Daniel Laszlo * chore(deps): bump sigstore/cosign-installer from 3.0.5 to 3.1.0 (#7664) Bumps [sigstore/cosign-installer](https://github.com/sigstore/cosign-installer) from 3.0.5 to 3.1.0. - [Release notes](https://github.com/sigstore/cosign-installer/releases) - [Commits](https://github.com/sigstore/cosign-installer/compare/dd6b2e2b610a11fd73dd187a43d57cc1394e35f9...d13028333d784fcc802b67ec924bcebe75aa0a5f) --- updated-dependencies: - dependency-name: sigstore/cosign-installer dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Signed-off-by: Daniel Laszlo * chore(deps): bump ossf/scorecard-action from 2.1.3 to 2.2.0 (#7663) Bumps [ossf/scorecard-action](https://github.com/ossf/scorecard-action) from 2.1.3 to 2.2.0. - [Release notes](https://github.com/ossf/scorecard-action/releases) - [Changelog](https://github.com/ossf/scorecard-action/blob/main/RELEASE.md) - [Commits](https://github.com/ossf/scorecard-action/compare/80e868c13c90f172d68d1f4501dee99e2479f7af...08b4669551908b1024bb425080c797723083c031) --- updated-dependencies: - dependency-name: ossf/scorecard-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Signed-off-by: Daniel Laszlo * use resource.New instead of Merge Signed-off-by: Daniel Laszlo * fix tabs Signed-off-by: Daniel Laszlo * [Chore] bump notation-go from 1.0.0-rc.3 -> 1.0.0-rc.6 (#7650) * Bump notation-go from 1.0.0-rc.3 -> 1.0.0-rc.6 Signed-off-by: webstradev * fixed tests Signed-off-by: Vishal Choudhary * added tests for repository Signed-off-by: Vishal Choudhary --------- Signed-off-by: webstradev Signed-off-by: Vishal Choudhary Co-authored-by: webstradev Co-authored-by: shuting Signed-off-by: Daniel Laszlo * fix: vscode debug config (#7653) Signed-off-by: Charles-Edouard Brétéché Signed-off-by: Daniel Laszlo * fix: pr updater workflow (#7665) Signed-off-by: Charles-Edouard Brétéché Signed-off-by: Daniel Laszlo * refactor: add specific loaders from #7597 (#7671) Signed-off-by: Charles-Edouard Brétéché Signed-off-by: Daniel Laszlo * feat: add cluster select and relabling config for ServiceMonitors (#7659) * feat: add cluster select and relabling config for ServiceMonitors Signed-off-by: Frank Jogeleit * feat: add cluster select and relabling config for ServiceMonitors Signed-off-by: Frank Jogeleit --------- Signed-off-by: Frank Jogeleit Signed-off-by: Daniel Laszlo * fix: cleanup controller context from #7597 (#7672) Signed-off-by: Charles-Edouard Brétéché Signed-off-by: Daniel Laszlo * fix: cleanup controller rbac (#7669) Signed-off-by: Charles-Edouard Brétéché Signed-off-by: Daniel Laszlo * refactor: migrate context loaders (part 1) from #7597 (#7676) Signed-off-by: Charles-Edouard Brétéché Signed-off-by: Daniel Laszlo * refactor: migrate context loaders (part 2) from #7597 (#7677) * refactor: migrate context loaders (part 1) from #7597 Signed-off-by: Charles-Edouard Brétéché * refactor: migrate context loaders (part 2) from #7597 Signed-off-by: Charles-Edouard Brétéché --------- Signed-off-by: Charles-Edouard Brétéché Signed-off-by: Daniel Laszlo * feat: add lazy loading feature flag (#7680) Signed-off-by: Charles-Edouard Brétéché Signed-off-by: Daniel Laszlo * fix: image verification (#7652) Signed-off-by: Charles-Edouard Brétéché Signed-off-by: Daniel Laszlo * Fix deferred loading (#7597) * handle nested contexts Signed-off-by: Jim Bugwadia * add feature flag Signed-off-by: Jim Bugwadia * fix tests Signed-off-by: Jim Bugwadia * add kuttl tests Signed-off-by: Jim Bugwadia * fix linter issues Signed-off-by: Jim Bugwadia * fix CLI regclient Signed-off-by: Jim Bugwadia * fix: token permissions on report vulns workflow (#7611) Signed-off-by: Charles-Edouard Brétéché * fix: token permissions (#7619) Signed-off-by: Charles-Edouard Brétéché * fix: update the flag descriptions of the reports-controller (#7617) Signed-off-by: emmanuel-ferdman * fix: panic if env var not defined (#7613) * fix: panic if env var not defined Signed-off-by: Charles-Edouard Brétéché * fix Signed-off-by: Charles-Edouard Brétéché * fix Signed-off-by: Charles-Edouard Brétéché --------- Signed-off-by: Charles-Edouard Brétéché * use toggles instead of a flag Signed-off-by: Jim Bugwadia * update toggle name Signed-off-by: Jim Bugwadia * update toggle name Signed-off-by: Jim Bugwadia * fix roles Signed-off-by: Jim Bugwadia * fix role Signed-off-by: Jim Bugwadia * update manifests Signed-off-by: Jim Bugwadia * remove extra unlock Signed-off-by: Jim Bugwadia * fix loader reset Signed-off-by: Jim Bugwadia * add tests Signed-off-by: Jim Bugwadia * propagate context Signed-off-by: Charles-Edouard Brétéché * cm resolver Signed-off-by: Charles-Edouard Brétéché * level management Signed-off-by: Charles-Edouard Brétéché * address review comments Signed-off-by: Jim Bugwadia * add enableDeferredLoading to other controllers Signed-off-by: Jim Bugwadia * re-enable ACR credhelper Signed-off-by: Jim Bugwadia * improve tests Signed-off-by: Jim Bugwadia * remove image registry client init Signed-off-by: Jim Bugwadia * check for invalid reset/restore Signed-off-by: Jim Bugwadia * recursive kuttl test Signed-off-by: Charles-Edouard Brétéché * add pre/post queries Signed-off-by: Jim Bugwadia * add check for a recursive match Signed-off-by: Jim Bugwadia * new test suite Signed-off-by: Charles-Edouard Brétéché * eval loaders at creation level Signed-off-by: Jim Bugwadia * kuttl test Signed-off-by: Charles-Edouard Brétéché * add an index for resolving deps in order Signed-off-by: Jim Bugwadia * improve comment Signed-off-by: Jim Bugwadia * extract remove method Signed-off-by: Jim Bugwadia * merge main Signed-off-by: Charles-Edouard Brétéché * flags Signed-off-by: Charles-Edouard Brétéché * feature flag Signed-off-by: Charles-Edouard Brétéché * fix flag Signed-off-by: Charles-Edouard Brétéché * update unit tests Signed-off-by: ShutingZhao * two rules kuttl test Signed-off-by: Charles-Edouard Brétéché * update unit tests Signed-off-by: ShutingZhao * revert Signed-off-by: ShutingZhao * per rule checkpoint Signed-off-by: Charles-Edouard Brétéché * fix Signed-off-by: Charles-Edouard Brétéché * fix mutate chained rules Signed-off-by: ShutingZhao * per rule checpoint/restore Signed-off-by: Charles-Edouard Brétéché * log error Signed-off-by: Charles-Edouard Brétéché --------- Signed-off-by: Jim Bugwadia Signed-off-by: Charles-Edouard Brétéché Signed-off-by: emmanuel-ferdman Signed-off-by: ShutingZhao Co-authored-by: Charles-Edouard Brétéché Co-authored-by: Emmanuel Ferdman Co-authored-by: shuting Signed-off-by: Daniel Laszlo * fix: factorise confimap informer code (#7667) Signed-off-by: Charles-Edouard Brétéché Co-authored-by: shuting Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Signed-off-by: Daniel Laszlo * chore(deps): bump sigstore/cosign-installer from 3.1.0 to 3.1.1 (#7689) Bumps [sigstore/cosign-installer](https://github.com/sigstore/cosign-installer) from 3.1.0 to 3.1.1. - [Release notes](https://github.com/sigstore/cosign-installer/releases) - [Commits](https://github.com/sigstore/cosign-installer/compare/d13028333d784fcc802b67ec924bcebe75aa0a5f...6e04d228eb30da1757ee4e1dd75a0ec73a653e06) --- updated-dependencies: - dependency-name: sigstore/cosign-installer dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Signed-off-by: Daniel Laszlo * Update pkg/tracing/config.go Signed-off-by: Charles-Edouard Brétéché --------- Signed-off-by: Daniel Laszlo Signed-off-by: Daniel Laszlo Signed-off-by: Charles-Edouard Brétéché Signed-off-by: dependabot[bot] Signed-off-by: webstradev Signed-off-by: Vishal Choudhary Signed-off-by: Frank Jogeleit Signed-off-by: Jim Bugwadia Signed-off-by: emmanuel-ferdman Signed-off-by: ShutingZhao Co-authored-by: Charles-Edouard Brétéché Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Vishal Choudhary Co-authored-by: webstradev Co-authored-by: shuting Co-authored-by: Frank Jogeleit Co-authored-by: Jim Bugwadia Co-authored-by: Emmanuel Ferdman Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- pkg/tracing/config.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkg/tracing/config.go b/pkg/tracing/config.go index be9b25af3f..90b98c18c2 100644 --- a/pkg/tracing/config.go +++ b/pkg/tracing/config.go @@ -43,13 +43,15 @@ func NewTraceConfig(log logr.Logger, tracerName, address, certs string, kubeClie log.Error(err, "Failed to create the collector exporter") return nil, err } - res, err := resource.Merge( - resource.Default(), - resource.NewWithAttributes( - semconv.SchemaURL, + res, err := resource.New( + ctx, + resource.WithSchemaURL(semconv.SchemaURL), + resource.WithTelemetrySDK(), + resource.WithAttributes( semconv.ServiceNameKey.String(tracerName), semconv.ServiceVersionKey.String(version.BuildVersion), ), + resource.WithFromEnv(), ) if err != nil { log.Error(err, "failed creating resource")