Skip to content

Commit 494287c

Browse files
cyrille-leclerccyrille-leclerc
authored
Adopt OTel naming conventions (#1024)
Adopt OTel naming conventions: JenkinsOtelSemanticAttributes -> JenkinsAttributes, GitHubSemanticAttributes -> GitHubAttributes...
1 parent f27fcf8 commit 494287c

File tree

57 files changed

+407
-412
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+407
-412
lines changed

‎src/main/java/io/jenkins/plugins/opentelemetry/JenkinsControllerOpenTelemetry.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import hudson.ExtensionList;
1212
import hudson.ExtensionPoint;
1313
import io.jenkins.plugins.opentelemetry.api.ReconfigurableOpenTelemetry;
14-
import io.jenkins.plugins.opentelemetry.semconv.JenkinsOtelSemanticAttributes;
14+
import io.jenkins.plugins.opentelemetry.semconv.ExtendedJenkinsAttributes;
1515
import io.opentelemetry.api.OpenTelemetry;
1616
import io.opentelemetry.api.incubator.events.EventLogger;
1717
import io.opentelemetry.api.metrics.Meter;
@@ -56,17 +56,17 @@ public void postConstruct() {
5656

5757
this.defaultTracer =
5858
this.openTelemetry
59-
.tracerBuilder(JenkinsOtelSemanticAttributes.INSTRUMENTATION_NAME)
59+
.tracerBuilder(ExtendedJenkinsAttributes.INSTRUMENTATION_NAME)
6060
.setInstrumentationVersion(opentelemetryPluginVersion)
6161
.build();
6262

6363
this.defaultEventLogger = openTelemetry
64-
.eventLoggerBuilder(JenkinsOtelSemanticAttributes.INSTRUMENTATION_NAME)
64+
.eventLoggerBuilder(ExtendedJenkinsAttributes.INSTRUMENTATION_NAME)
6565
.setInstrumentationVersion(opentelemetryPluginVersion)
6666
.build();
6767

6868
this.defaultMeter = openTelemetry
69-
.meterBuilder(JenkinsOtelSemanticAttributes.INSTRUMENTATION_NAME)
69+
.meterBuilder(ExtendedJenkinsAttributes.INSTRUMENTATION_NAME)
7070
.setInstrumentationVersion(opentelemetryPluginVersion)
7171
.build();
7272
}

‎src/main/java/io/jenkins/plugins/opentelemetry/JenkinsOpenTelemetryPluginConfiguration.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import io.jenkins.plugins.opentelemetry.backend.ObservabilityBackend;
2727
import io.jenkins.plugins.opentelemetry.backend.custom.CustomLogStorageRetriever;
2828
import io.jenkins.plugins.opentelemetry.job.log.LogStorageRetriever;
29-
import io.jenkins.plugins.opentelemetry.semconv.JenkinsOtelSemanticAttributes;
29+
import io.jenkins.plugins.opentelemetry.semconv.ExtendedJenkinsAttributes;
3030
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
3131
import io.opentelemetry.sdk.autoconfigure.spi.internal.DefaultConfigProperties;
3232
import io.opentelemetry.sdk.resources.Resource;
@@ -232,8 +232,8 @@ public OpenTelemetryConfiguration toOpenTelemetryConfiguration() {
232232

233233
Map<String, String> configurationProperties = new HashMap<>();
234234
getObservabilityBackends().forEach(backend -> configurationProperties.putAll(backend.getOtelConfigurationProperties()));
235-
configurationProperties.put(JenkinsOtelSemanticAttributes.JENKINS_VERSION.getKey(), OtelUtils.getJenkinsVersion());
236-
configurationProperties.put(JenkinsOtelSemanticAttributes.JENKINS_URL.getKey(), this.jenkinsLocationConfiguration.getUrl());
235+
configurationProperties.put(ExtendedJenkinsAttributes.JENKINS_VERSION.getKey(), OtelUtils.getJenkinsVersion());
236+
configurationProperties.put(ExtendedJenkinsAttributes.JENKINS_URL.getKey(), this.jenkinsLocationConfiguration.getUrl());
237237
configurationProperties.put(OTEL_INSTRUMENTATION_JENKINS_EXPORT_OTEL_CONFIG_AS_ENV_VARS.asProperty(), Boolean.toString(this.exportOtelConfigurationAsEnvironmentVariables));
238238

239239
// use same Jenkins instance identifier as the Jenkins Support Core plugin. No need to add the complexity of the instance-identity-plugin
@@ -529,7 +529,7 @@ public String findSymbolOrDefault(@NonNull String buildStepName, @Nullable Descr
529529
* @see io.opentelemetry.semconv.ServiceAttributes#SERVICE_NAME
530530
*/
531531
public String getServiceName() {
532-
return (Strings.isNullOrEmpty(this.serviceName)) ? JenkinsOtelSemanticAttributes.JENKINS : this.serviceName;
532+
return (Strings.isNullOrEmpty(this.serviceName)) ? ExtendedJenkinsAttributes.JENKINS : this.serviceName;
533533
}
534534

535535
@DataBoundSetter
@@ -542,7 +542,7 @@ public void setServiceName(String serviceName) {
542542
* @see io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes#SERVICE_NAMESPACE
543543
*/
544544
public String getServiceNamespace() {
545-
return (Strings.isNullOrEmpty(this.serviceNamespace)) ? JenkinsOtelSemanticAttributes.JENKINS : this.serviceNamespace;
545+
return (Strings.isNullOrEmpty(this.serviceNamespace)) ? ExtendedJenkinsAttributes.JENKINS : this.serviceNamespace;
546546
}
547547

548548
@DataBoundSetter

‎src/main/java/io/jenkins/plugins/opentelemetry/OpenTelemetryConfiguration.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import edu.umd.cs.findbugs.annotations.NonNull;
1111
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
1212
import io.jenkins.plugins.opentelemetry.authentication.OtlpAuthentication;
13-
import io.jenkins.plugins.opentelemetry.semconv.JenkinsOtelSemanticAttributes;
13+
import io.jenkins.plugins.opentelemetry.semconv.ExtendedJenkinsAttributes;
1414
import io.opentelemetry.sdk.resources.Resource;
1515
import io.opentelemetry.sdk.resources.ResourceBuilder;
1616
import io.opentelemetry.semconv.ServiceAttributes;
@@ -147,7 +147,7 @@ public Resource toOpenTelemetryResource() {
147147
this.getServiceNamespace().ifPresent(serviceNamespace ->
148148
resourceBuilder.put(ServiceIncubatingAttributes.SERVICE_NAMESPACE, serviceNamespace));
149149

150-
resourceBuilder.put(JenkinsOtelSemanticAttributes.JENKINS_OPEN_TELEMETRY_PLUGIN_VERSION, OtelUtils.getOpentelemetryPluginVersion());
150+
resourceBuilder.put(ExtendedJenkinsAttributes.JENKINS_OPEN_TELEMETRY_PLUGIN_VERSION, OtelUtils.getOpentelemetryPluginVersion());
151151

152152
return resourceBuilder.build();
153153
}
@@ -163,7 +163,7 @@ public Map<String, String> toOpenTelemetryResourceAsMap() {
163163
this.getServiceNamespace().ifPresent(serviceNamespace ->
164164
resourceMap.put(ServiceIncubatingAttributes.SERVICE_NAMESPACE.getKey(), serviceNamespace));
165165

166-
resourceMap.put(JenkinsOtelSemanticAttributes.JENKINS_OPEN_TELEMETRY_PLUGIN_VERSION.getKey(), OtelUtils.getOpentelemetryPluginVersion());
166+
resourceMap.put(ExtendedJenkinsAttributes.JENKINS_OPEN_TELEMETRY_PLUGIN_VERSION.getKey(), OtelUtils.getOpentelemetryPluginVersion());
167167

168168
return resourceMap;
169169
}

‎src/main/java/io/jenkins/plugins/opentelemetry/backend/elastic/ElasticsearchBuildLogsLineIterator.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import com.google.common.collect.Iterators;
2323
import io.jenkins.plugins.opentelemetry.job.log.ConsoleNotes;
2424
import io.jenkins.plugins.opentelemetry.job.log.util.LineIterator;
25-
import io.jenkins.plugins.opentelemetry.semconv.JenkinsOtelSemanticAttributes;
25+
import io.jenkins.plugins.opentelemetry.semconv.ExtendedJenkinsAttributes;
2626
import io.opentelemetry.api.trace.Span;
2727
import io.opentelemetry.api.trace.SpanBuilder;
2828
import io.opentelemetry.api.trace.Tracer;
@@ -127,11 +127,11 @@ Iterator<String> getCurrentIterator() {
127127
public void close() throws IOException {
128128
Tracer tracer = logger.isLoggable(Level.FINE) ? this.tracer : TracerProvider.noop().get("noop");
129129
SpanBuilder spanBuilder = tracer.spanBuilder("ElasticsearchBuildLogsLineIterator.close")
130-
.setAttribute(JenkinsOtelSemanticAttributes.CI_PIPELINE_ID, jobFullName)
131-
.setAttribute(JenkinsOtelSemanticAttributes.CI_PIPELINE_RUN_NUMBER, (long) runNumber)
130+
.setAttribute(ExtendedJenkinsAttributes.CI_PIPELINE_ID, jobFullName)
131+
.setAttribute(ExtendedJenkinsAttributes.CI_PIPELINE_RUN_NUMBER, (long) runNumber)
132132
.setAttribute("pointInTimeId", pointInTimeId);
133133
if (flowNodeId != null) {
134-
spanBuilder.setAttribute(JenkinsOtelSemanticAttributes.JENKINS_STEP_ID, flowNodeId);
134+
spanBuilder.setAttribute(ExtendedJenkinsAttributes.JENKINS_STEP_ID, flowNodeId);
135135
}
136136
Span closeSpan = spanBuilder.startSpan();
137137
try (Scope ignored = closeSpan.makeCurrent()) {
@@ -218,8 +218,8 @@ protected Iterator<String> loadNextFormattedLogLines() throws IOException {
218218
public void skipLines(long skipLines) {
219219
Tracer tracer = logger.isLoggable(Level.FINE) ? this.tracer : TracerProvider.noop().get("noop");
220220
SpanBuilder spanBuilder = tracer.spanBuilder("ElasticsearchBuildLogsLineIterator.skip")
221-
.setAttribute(JenkinsOtelSemanticAttributes.CI_PIPELINE_ID, jobFullName)
222-
.setAttribute(JenkinsOtelSemanticAttributes.CI_PIPELINE_RUN_NUMBER, (long) runNumber)
221+
.setAttribute(ExtendedJenkinsAttributes.CI_PIPELINE_ID, jobFullName)
222+
.setAttribute(ExtendedJenkinsAttributes.CI_PIPELINE_RUN_NUMBER, (long) runNumber)
223223
.setAttribute("pointInTimeId", pointInTimeId)
224224
.setAttribute("skipLines", skipLines);
225225
Span span = spanBuilder.startSpan();
@@ -278,7 +278,7 @@ public String apply(Hit<ObjectNode> hit) {
278278
if (labels == null) {
279279
annotations = null;
280280
} else {
281-
JsonNode annotationsAsText = labels.get(JenkinsOtelSemanticAttributes.JENKINS_ANSI_ANNOTATIONS.getKey());
281+
JsonNode annotationsAsText = labels.get(ExtendedJenkinsAttributes.JENKINS_ANSI_ANNOTATIONS.getKey());
282282
if (annotationsAsText == null) {
283283
annotations = null;
284284
} else {

‎src/main/java/io/jenkins/plugins/opentelemetry/backend/elastic/ElasticsearchFields.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
package io.jenkins.plugins.opentelemetry.backend.elastic;
77

8-
import io.jenkins.plugins.opentelemetry.semconv.JenkinsOtelSemanticAttributes;
8+
import io.jenkins.plugins.opentelemetry.semconv.ExtendedJenkinsAttributes;
99
import io.opentelemetry.api.trace.SpanContext;
1010

1111
public interface ElasticsearchFields {
@@ -18,9 +18,9 @@ public interface ElasticsearchFields {
1818
*/
1919
String FIELD_TRACE_ID = "trace.id";
2020
String FIELD_TIMESTAMP = "@timestamp";
21-
String FIELD_CI_PIPELINE_ID = "labels." + JenkinsOtelSemanticAttributes.CI_PIPELINE_ID.getKey().replace('.', '_');
22-
String FIELD_CI_PIPELINE_RUN_NUMBER = "numeric_labels." + JenkinsOtelSemanticAttributes.CI_PIPELINE_RUN_NUMBER.getKey().replace('.', '_');
23-
String FIELD_JENKINS_STEP_ID = "labels." + JenkinsOtelSemanticAttributes.JENKINS_STEP_ID.getKey().replace('.', '_');
21+
String FIELD_CI_PIPELINE_ID = "labels." + ExtendedJenkinsAttributes.CI_PIPELINE_ID.getKey().replace('.', '_');
22+
String FIELD_CI_PIPELINE_RUN_NUMBER = "numeric_labels." + ExtendedJenkinsAttributes.CI_PIPELINE_RUN_NUMBER.getKey().replace('.', '_');
23+
String FIELD_JENKINS_STEP_ID = "labels." + ExtendedJenkinsAttributes.JENKINS_STEP_ID.getKey().replace('.', '_');
2424
String INDEX_TEMPLATE_PATTERNS = "logs-apm.app-*,.ds-logs-apm.app*";
2525
String INDEX_TEMPLATE_NAME = "logs-apm.app";
2626
/**

‎src/main/java/io/jenkins/plugins/opentelemetry/backend/elastic/ElasticsearchLogStorageRetriever.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import io.jenkins.plugins.opentelemetry.job.log.util.InputStreamByteBuffer;
3333
import io.jenkins.plugins.opentelemetry.job.log.util.LineIterator;
3434
import io.jenkins.plugins.opentelemetry.job.log.util.LineIteratorInputStream;
35-
import io.jenkins.plugins.opentelemetry.semconv.JenkinsOtelSemanticAttributes;
35+
import io.jenkins.plugins.opentelemetry.semconv.ExtendedJenkinsAttributes;
3636
import io.opentelemetry.api.trace.Span;
3737
import io.opentelemetry.api.trace.SpanBuilder;
3838
import io.opentelemetry.api.trace.Tracer;
@@ -155,8 +155,8 @@ public LogsQueryResult overallLog(
155155
Charset charset = StandardCharsets.UTF_8;
156156

157157
SpanBuilder spanBuilder = getTracer().spanBuilder("ElasticsearchLogStorageRetriever.overallLog")
158-
.setAttribute(JenkinsOtelSemanticAttributes.CI_PIPELINE_ID, jobFullName)
159-
.setAttribute(JenkinsOtelSemanticAttributes.CI_PIPELINE_RUN_NUMBER, (long) runNumber)
158+
.setAttribute(ExtendedJenkinsAttributes.CI_PIPELINE_ID, jobFullName)
159+
.setAttribute(ExtendedJenkinsAttributes.CI_PIPELINE_RUN_NUMBER, (long) runNumber)
160160
.setAttribute("complete", complete);
161161

162162
Span span = spanBuilder.startSpan();
@@ -191,9 +191,9 @@ public LogsQueryResult stepLog(@NonNull String jobFullName, int runNumber, @NonN
191191
final Charset charset = StandardCharsets.UTF_8;
192192

193193
SpanBuilder spanBuilder = getTracer().spanBuilder("ElasticsearchLogStorageRetriever.stepLog")
194-
.setAttribute(JenkinsOtelSemanticAttributes.CI_PIPELINE_ID, jobFullName)
195-
.setAttribute(JenkinsOtelSemanticAttributes.CI_PIPELINE_RUN_NUMBER, (long) runNumber)
196-
.setAttribute(JenkinsOtelSemanticAttributes.JENKINS_STEP_ID, flowNodeId)
194+
.setAttribute(ExtendedJenkinsAttributes.CI_PIPELINE_ID, jobFullName)
195+
.setAttribute(ExtendedJenkinsAttributes.CI_PIPELINE_RUN_NUMBER, (long) runNumber)
196+
.setAttribute(ExtendedJenkinsAttributes.JENKINS_STEP_ID, flowNodeId)
197197
.setAttribute("complete", complete);
198198

199199
Span span = spanBuilder.startSpan();

‎src/main/java/io/jenkins/plugins/opentelemetry/backend/grafana/LokiLogStorageRetriever.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import io.jenkins.plugins.opentelemetry.job.log.util.InputStreamByteBuffer;
1919
import io.jenkins.plugins.opentelemetry.job.log.util.LogLineIterator;
2020
import io.jenkins.plugins.opentelemetry.job.log.util.LogLineIteratorInputStream;
21-
import io.jenkins.plugins.opentelemetry.semconv.JenkinsOtelSemanticAttributes;
21+
import io.jenkins.plugins.opentelemetry.semconv.ExtendedJenkinsAttributes;
2222
import io.opentelemetry.api.GlobalOpenTelemetry;
2323
import io.opentelemetry.api.OpenTelemetry;
2424
import io.opentelemetry.api.trace.Span;
@@ -94,7 +94,7 @@ public LokiLogStorageRetriever(@Nonnull String lokiUrl, boolean disableSslVerifi
9494
this.lokiTenantId = lokiTenantId;
9595
this.httpContext = new BasicHttpContext();
9696
this.openTelemetry = GlobalOpenTelemetry.get();
97-
this.tracer = openTelemetry.getTracer(JenkinsOtelSemanticAttributes.INSTRUMENTATION_NAME);
97+
this.tracer = openTelemetry.getTracer(ExtendedJenkinsAttributes.INSTRUMENTATION_NAME);
9898

9999
HttpClientBuilder httpClientBuilder = ApacheHttpClientTelemetry.create(openTelemetry).newHttpClientBuilder();
100100
if (disableSslVerifications) {
@@ -118,8 +118,8 @@ public LokiLogStorageRetriever(@Nonnull String lokiUrl, boolean disableSslVerifi
118118
@Override
119119
public LogsQueryResult overallLog(@Nonnull String jobFullName, int runNumber, @Nonnull String traceId, @Nonnull String spanId, boolean complete, @Nonnull Instant startTime, @Nullable Instant endTime) {
120120
SpanBuilder spanBuilder = tracer.spanBuilder("LokiLogStorageRetriever.overallLog")
121-
.setAttribute(JenkinsOtelSemanticAttributes.CI_PIPELINE_ID, jobFullName)
122-
.setAttribute(JenkinsOtelSemanticAttributes.CI_PIPELINE_RUN_NUMBER, (long) runNumber)
121+
.setAttribute(ExtendedJenkinsAttributes.CI_PIPELINE_ID, jobFullName)
122+
.setAttribute(ExtendedJenkinsAttributes.CI_PIPELINE_RUN_NUMBER, (long) runNumber)
123123
.setAttribute("complete", complete);
124124

125125
Span span = spanBuilder.startSpan();
@@ -139,7 +139,7 @@ public LogsQueryResult overallLog(@Nonnull String jobFullName, int runNumber, @N
139139
lokiQueryParameters,
140140
httpClient, httpContext,
141141
lokiUrl, lokiCredentials, lokiTenantId,
142-
openTelemetry.getTracer( JenkinsOtelSemanticAttributes.INSTRUMENTATION_NAME));
142+
openTelemetry.getTracer( ExtendedJenkinsAttributes.INSTRUMENTATION_NAME));
143143

144144
LogLineIterator.JenkinsHttpSessionLineBytesToLogLineIdMapper<Long> lineBytesToLineNumberConverter = new LogLineIterator.JenkinsHttpSessionLineBytesToLogLineIdMapper<>(jobFullName, runNumber, null);
145145
InputStream lineIteratorInputStream = new LogLineIteratorInputStream<>(logLines, lineBytesToLineNumberConverter, tracer);
@@ -176,9 +176,9 @@ public LogsQueryResult overallLog(@Nonnull String jobFullName, int runNumber, @N
176176
@Override
177177
public LogsQueryResult stepLog(@Nonnull String jobFullName, int runNumber, @Nonnull String flowNodeId, @Nonnull String traceId, @Nonnull String spanId, boolean complete, @Nonnull Instant startTime, @Nullable Instant endTime) {
178178
SpanBuilder spanBuilder = tracer.spanBuilder("LokiLogStorageRetriever.stepLog")
179-
.setAttribute(JenkinsOtelSemanticAttributes.CI_PIPELINE_ID, jobFullName)
180-
.setAttribute(JenkinsOtelSemanticAttributes.CI_PIPELINE_RUN_NUMBER, (long) runNumber)
181-
.setAttribute(JenkinsOtelSemanticAttributes.JENKINS_STEP_ID, flowNodeId)
179+
.setAttribute(ExtendedJenkinsAttributes.CI_PIPELINE_ID, jobFullName)
180+
.setAttribute(ExtendedJenkinsAttributes.CI_PIPELINE_RUN_NUMBER, (long) runNumber)
181+
.setAttribute(ExtendedJenkinsAttributes.JENKINS_STEP_ID, flowNodeId)
182182
.setAttribute("complete", complete);
183183

184184
Span span = spanBuilder.startSpan();

‎src/main/java/io/jenkins/plugins/opentelemetry/backend/grafana/LokiMetadata.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55

66
package io.jenkins.plugins.opentelemetry.backend.grafana;
77

8-
import io.jenkins.plugins.opentelemetry.semconv.JenkinsOtelSemanticAttributes;
8+
import io.jenkins.plugins.opentelemetry.semconv.ExtendedJenkinsAttributes;
99
import io.opentelemetry.semconv.ServiceAttributes;
1010
import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes;
1111

1212
public interface LokiMetadata {
1313
String LABEL_SERVICE_NAME = ServiceAttributes.SERVICE_NAME.getKey().replace('.', '_');
1414
String LABEL_SERVICE_NAMESPACE = ServiceIncubatingAttributes.SERVICE_NAMESPACE.getKey().replace('.', '_');
1515
String META_DATA_TRACE_ID = "trace_id";
16-
String META_DATA_CI_PIPELINE_ID = JenkinsOtelSemanticAttributes.CI_PIPELINE_ID.getKey().replace('.', '_');
17-
String META_DATA_CI_PIPELINE_RUN_NUMBER = JenkinsOtelSemanticAttributes.CI_PIPELINE_RUN_NUMBER.getKey().replace('.', '_');
18-
String META_DATA_JENKINS_PIPELINE_STEP_ID = JenkinsOtelSemanticAttributes.JENKINS_STEP_ID.getKey().replace('.', '_');
16+
String META_DATA_CI_PIPELINE_ID = ExtendedJenkinsAttributes.CI_PIPELINE_ID.getKey().replace('.', '_');
17+
String META_DATA_CI_PIPELINE_RUN_NUMBER = ExtendedJenkinsAttributes.CI_PIPELINE_RUN_NUMBER.getKey().replace('.', '_');
18+
String META_DATA_JENKINS_PIPELINE_STEP_ID = ExtendedJenkinsAttributes.JENKINS_STEP_ID.getKey().replace('.', '_');
1919
}

‎src/main/java/io/jenkins/plugins/opentelemetry/computer/MonitoringCloudListener.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import hudson.slaves.NodeProvisioner;
1313
import io.jenkins.plugins.opentelemetry.JenkinsControllerOpenTelemetry;
1414
import io.jenkins.plugins.opentelemetry.api.OpenTelemetryLifecycleListener;
15-
import io.jenkins.plugins.opentelemetry.semconv.JenkinsSemanticMetrics;
15+
import io.jenkins.plugins.opentelemetry.semconv.JenkinsMetrics;
1616
import io.opentelemetry.api.metrics.LongCounter;
1717
import io.opentelemetry.api.metrics.Meter;
1818
import jenkins.YesNoMaybe;
@@ -37,11 +37,11 @@ public void postConstruct() {
3737
Meter meter = jenkinsControllerOpenTelemetry.getDefaultMeter();
3838
LOGGER.log(Level.FINE, () -> "Start monitoring Jenkins controller cloud agent provisioning...");
3939

40-
failureCloudCounter = meter.counterBuilder(JenkinsSemanticMetrics.JENKINS_CLOUD_AGENTS_FAILURE)
40+
failureCloudCounter = meter.counterBuilder(JenkinsMetrics.JENKINS_CLOUD_AGENTS_FAILURE)
4141
.setDescription("Number of failed cloud agents when provisioning")
4242
.setUnit("{agents}")
4343
.build();
44-
totalCloudCount = meter.counterBuilder(JenkinsSemanticMetrics.JENKINS_CLOUD_AGENTS_COMPLETED)
44+
totalCloudCount = meter.counterBuilder(JenkinsMetrics.JENKINS_CLOUD_AGENTS_COMPLETED)
4545
.setDescription("Number of provisioned cloud agents")
4646
.setUnit("{agents}")
4747
.build();

0 commit comments

Comments
 (0)