Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tracer: Parse global labels per tracer #1290

Merged
merged 3 commits into from
Aug 10, 2022
Merged

tracer: Parse global labels per tracer #1290

merged 3 commits into from
Aug 10, 2022

Conversation

marclop
Copy link
Contributor

@marclop marclop commented Aug 10, 2022

Description

This patch removes the globalLabel variable and one-time parsing of
the global labels, in favor of parsing the global labels individually
on tracer construction. This has the advantage that tracers that are
created after start-up will parse environment variables at that time
and not only when the apm package is imported.

Encountered while writing a systemtest for elastic/apm-server#8139.

This patch removes the `globalLabel` variable and one-time parsing of
the global labels, in favor of parsing the global labels individually
on tracer construction. This has the advantage that tracers that are
created after start-up will parse environment variables at that time
and not only when the `apm` package is imported.

Encountered while writing a systemtest.

Signed-off-by: Marc Lopez Rubio <[email protected]>
@marclop marclop added the enhancement New feature or request label Aug 10, 2022
@marclop marclop requested a review from a team August 10, 2022 06:38
Copy link
Member

@axw axw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Can you please add a changelog entry for this?

Signed-off-by: Marc Lopez Rubio <[email protected]>
@apmmachine
Copy link
Contributor

apmmachine commented Aug 10, 2022

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2022-08-10T20:15:38.941+0000

  • Duration: 59 min 53 sec

Test stats 🧪

Test Results
Failed 0
Passed 8470
Skipped 201
Total 8671

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • run benchmark tests : Run the benchmark test.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@apmmachine
Copy link
Contributor

apmmachine commented Aug 10, 2022

🌐 Coverage report

Name Metrics % (covered/total) Diff
Packages 100.0% (59/59) 💚
Files 99.346% (152/153) 👍
Classes 96.275% (336/349) 👍
Methods 90.216% (959/1063) 👍 0.009
Lines 82.167% (11127/13542) 👍 0.018
Conditionals 100.0% (0/0) 💚

@marclop marclop enabled auto-merge (squash) August 10, 2022 10:32
@kruskall
Copy link
Member

Flaky test, I'll trigger another build

@kruskall
Copy link
Member

/test

@marclop marclop merged commit b8542dc into elastic:main Aug 10, 2022
@marclop marclop deleted the f/parse-global-labels-on-tracer-init branch August 10, 2022 21:14
@marclop
Copy link
Contributor Author

marclop commented Aug 11, 2022

Thanks!

v1v added a commit to v1v/apm-agent-go that referenced this pull request Sep 1, 2022
…hmark-reporting

* upstream/main: (25 commits)
  docs: update correct env flag for loglevel (elastic#1299)
  fix: readd deprecated span_frames_min_duration option as fallback for older configuration (elastic#1297)
  feat: rename span_frames_min_duration to span_stack_trace_min_duration (elastic#1285)
  test: verify Ubuntu cgroup line parsing for container ID (elastic#1293)
  tracer: Parse global labels per tracer (elastic#1290)
  feat: update sns span.name to reflect the current spec (elastic#1286)
  fix: expand k8s pod discovery regex (elastic#1288)
  test: add testcase for sqs delete_batch operation (elastic#1283)
  docs: document ELASTIC_APM_SERVER_CA_CERT_FILE (elastic#1289)
  fix: reformat code with go 1.19 to fix ci failure  (elastic#1284)
  feat: add service target fields support to elasticsearch module (elastic#1281)
  fix: use the correct destination resource and name for azure queue (elastic#1282)
  feat: add service target fields support to azure module (elastic#1280)
  feat: add service target fields support to aws module (elastic#1278)
  feat: add service target fields support to sql module (elastic#1279)
  synchronize json schema specs (elastic#1260)
  fix: make sure at least one of the service target fields is sent (elastic#1277)
  docs: add link to release-notes-2.x (elastic#1271)
  feat: add service target fields (elastic#1274)
  perf: skip tracestate regex validation for es vendor key (elastic#1275)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
agent-go enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants