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

JenkinsResourceProvider moved to opentelemetry-api-plugin #907

Merged
merged 2 commits into from
Jul 29, 2024
Merged

JenkinsResourceProvider moved to opentelemetry-api-plugin #907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7af8a8a
JenkinsResourceProvider moved to opentelemetry-api-plugin
cyrille-leclerc Jul 28, 2024
9e0a4bc
use GA opentelemetry-api-plugin
cyrille-leclerc Jul 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
<changelist>999999-SNAPSHOT</changelist>
<jenkins.version>2.440.3</jenkins.version>
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
<opentelemetry.version>1.39.0</opentelemetry.version>
<opentelemetry-instrumentation.version>2.5.0</opentelemetry-instrumentation.version>
<opentelemetry.version>1.40.0</opentelemetry.version>
<opentelemetry-instrumentation.version>2.6.0</opentelemetry-instrumentation.version>
<opentelemetry-semconv.version>1.25.0-alpha</opentelemetry-semconv.version>
<opentelemetry-contrib.version>1.36.0-alpha</opentelemetry-contrib.version>
<useBeta>true</useBeta>
Expand Down Expand Up @@ -104,7 +104,7 @@
<dependency>
<groupId>io.jenkins.plugins</groupId>
<artifactId>opentelemetry-api</artifactId>
<version>1.39.0-11.vd6b_87589988f</version>
<version>1.40.0-23.v7da_9d4c543d3</version>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
Expand Down Expand Up @@ -492,6 +492,7 @@
<io.jenkins.plugins.opentelemetry.init.JenkinsExecutorMonitoringInitializer>INFO</io.jenkins.plugins.opentelemetry.init.JenkinsExecutorMonitoringInitializer>
<io.jenkins.plugins.opentelemetry.job.MonitoringRunListener>INFO</io.jenkins.plugins.opentelemetry.job.MonitoringRunListener>
<io.jenkins.plugins.opentelemetry.opentelemetry.ReconfigurableMeterProvider>FINE</io.jenkins.plugins.opentelemetry.opentelemetry.ReconfigurableMeterProvider>
<io.jenkins.plugins.opentelemetry.opentelemetry.resources.JenkinsResourceProvider>FINEST</io.jenkins.plugins.opentelemetry.opentelemetry.resources.JenkinsResourceProvider>
</loggers>
</configuration>
</plugin>
Expand Down
41 changes: 0 additions & 41 deletions ...ava/io/jenkins/plugins/opentelemetry/opentelemetry/resources/JenkinsResourceProvider.java
View file
Open in desktop

This file was deleted.

14 changes: 2 additions & 12 deletions src/main/java/io/jenkins/plugins/opentelemetry/semconv/JenkinsOtelSemanticAttributes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import hudson.PluginWrapper;
import hudson.model.Computer;
import io.jenkins.plugins.opentelemetry.OtelUtils;
import io.jenkins.plugins.opentelemetry.api.semconv.JenkinsAttributes;
import io.opentelemetry.api.common.AttributeKey;
import jenkins.model.Jenkins;
import org.jenkinsci.plugins.workflow.steps.StepDescriptor;
Expand All @@ -18,7 +18,7 @@
* @see io.opentelemetry.api.common.Attributes
* @see io.opentelemetry.semconv.ServiceAttributes
*/
public final class JenkinsOtelSemanticAttributes {
public final class JenkinsOtelSemanticAttributes extends JenkinsAttributes {

Check warning on line 21 in src/main/java/io/jenkins/plugins/opentelemetry/semconv/JenkinsOtelSemanticAttributes.java

View check run for this annotation

ci.jenkins.io / Code Coverage

Not covered line 

Line 21 is not covered by tests
public static final AttributeKey<String> CI_PIPELINE_TYPE = AttributeKey.stringKey("ci.pipeline.type");
public static final AttributeKey<String> CI_PIPELINE_MULTIBRANCH_TYPE = AttributeKey.stringKey("ci.pipeline.multibranch.type");
public static final AttributeKey<String> CI_PIPELINE_ID = AttributeKey.stringKey("ci.pipeline.id");
Expand Down Expand Up @@ -55,14 +55,6 @@
public static final AttributeKey<Long> GIT_CLONE_DEPTH = AttributeKey.longKey("git.clone.depth");
public static final AttributeKey<Boolean> GIT_CLONE_SHALLOW = AttributeKey.booleanKey("git.clone.shallow");

/**
* @see Jenkins#getRootUrl()
*/
public static final AttributeKey<String> JENKINS_URL = AttributeKey.stringKey("jenkins.url");
/**
* @see OtelUtils#getJenkinsVersion()
*/
public static final AttributeKey<String> JENKINS_VERSION = AttributeKey.stringKey("jenkins.version");
/**
* @see StepDescriptor#getDisplayName()
*/
Expand Down Expand Up @@ -99,8 +91,6 @@

public static final AttributeKey<String> JENKINS_CREDENTIALS_ID = AttributeKey.stringKey("jenkins.credentials.id");

public static final String JENKINS = "jenkins";

/**
* As {@link Jenkins.MasterComputer#getName()} returns "", choose another name
*
Expand Down
1 change: 0 additions & 1 deletion src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider
View file
Open in desktop

This file was deleted.

Loading