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.

Sign up for GitHub

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

Jump to bottom

Add the Jenkins Otel Plugin Version resource attribute #259

Merged
merged 4 commits into from
Dec 20, 2021
Merged

Add the Jenkins Otel Plugin Version resource attribute #259

merged 4 commits into from
Dec 20, 2021

Conversation

v1v
Copy link
Member

@v1v v1v commented Dec 16, 2021 •
edited
Loading

  • Make sure you are opening from a topic/feature/bugfix branch (right side) and not your main branch!
  • Ensure that the pull request title represents the desired changelog entry
  • Please describe what you did
  • Link to relevant issues in GitHub or Jira
  • Link to relevant pull requests, esp. upstream and downstream changes
  • Ensure you have provided tests - that demonstrates feature works or fixes the issue

what

  • Refactor the getJenkinsVersion and use the one in the OtelUtils
  • Add Resource Attribute for the Jenkins OpenTelemetry Plugin version.

Closes #258

UI

image

@v1v v1v requested a review from kuisathaverat as a code owner December 16, 2021 22:44
@v1v v1v self-assigned this Dec 16, 2021
@v1v v1v added the bug Something isn't working label Dec 16, 2021
@v1v v1v requested a review from cyrille-leclerc December 17, 2021 15:55
@cyrille-leclerc
Copy link
Contributor

@v1v who got guidance from @trask on

We should use OpenTelemetry.getTracer(instrumentName, instrumentVersion)
See
https://github.com/jenkinsci/opentelemetry-plugin/blob/opentelemetry-1.1.0-rc1/src/main/java/io/jenkins/plugins/opentelemetry/OpenTelemetrySdkProvider.java#L159

Could you use the OtelUtils.getOpentelemetryPluginVersion() you introduced with OpenTelemetry.getTracer(instrumentName, instrumentVersion)?

@cyrille-leclerc cyrille-leclerc merged commit fb37a6a into jenkinsci:master Dec 20, 2021
v1v added a commit to v1v/opentelemetry-plugin that referenced this pull request Dec 21, 2021
@v1v
Merge remote-tracking branch 'upstream/master' into feature/retrieve-…
c52300c 
…culprits

* upstream/master: (36 commits)
  Rename attribute `otel.library.name`: "jenkins" -> "jenkins-opentelemetry"
  Bump dependencies
  Use git hostname for "peer.service" attribute for better readability in Jaeger
  Add the Jenkins Otel Plugin Version resource attribute (jenkinsci#259)
  Reduce agent cardinality
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release opentelemetry-1.1.0-rc1
  Move Kibana dashboard definition from docs/ to src/kibana/ because it's source code
  Add resource attributes provided by the ResourceProvider SPI (jenkinsci#252)
  Simplify Elastic Kibana Dashboard URL configuration (jenkinsci#248)
  Bump mvn wrapper to 3.8.4 (jenkinsci#250)
  rename images
  update doc images
  Allow compatibility with kibana 7.15
  Add service dropdown list
  Cleanup Kibana Dashboards * 1 single ndjson instead of 2 * Rename "CI/CD Overview" -> "Jenkins Overview" * Use Jenkins and OpenTelemetry official colors on tags * Remove the tag "infra"
  Better link to a monitoring dashboard on the Jenkins homepage
  Add monitoring dashboard link on Jenkins homepage
  Add monitoring dashboard link on Jenkins homepage
  Add monitoring dashboard link on Jenkins homepage
  ...
@cyrille-leclerc cyrille-leclerc added this to the 1.1.0 milestone Dec 21, 2021
@v1v v1v mentioned this pull request Jan 10, 2022
Merged
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kuisathaverat kuisathaverat kuisathaverat approved these changes

@cyrille-leclerc cyrille-leclerc Awaiting requested review from cyrille-leclerc

Assignees

@v1v v1v

Labels
bug Something isn't working
Projects
None yet
Milestone
1.1.0
Development

Successfully merging this pull request may close these issues.

The Jenkins Otel Plugin Version is missing from the resource attributes
3 participants
@v1v @cyrille-leclerc @kuisathaverat