Skip to content

Commit 7df1e62

Browse files
committed
fix semconv
1 parent f67898b commit 7df1e62

File tree

6 files changed

+14
-10
lines changed

6 files changed

+14
-10
lines changed

grpc/src/main/java/io/opentelemetry/examples/grpc/ExampleConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import io.opentelemetry.sdk.resources.Resource;
1313
import io.opentelemetry.sdk.trace.SdkTracerProvider;
1414
import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor;
15-
import io.opentelemetry.semconv.ResourceAttributes;
15+
import io.opentelemetry.semconv.ServiceAttributes;
1616

1717
public final class ExampleConfiguration {
1818

@@ -25,7 +25,7 @@ static OpenTelemetry initializeOpenTelemetry(String ip, int port) {
2525
ZipkinSpanExporter zipkinExporter = ZipkinSpanExporter.builder().setEndpoint(endpoint).build();
2626

2727
Resource serviceNameResource =
28-
Resource.create(Attributes.of(ResourceAttributes.SERVICE_NAME, SERVICE_NAME));
28+
Resource.create(Attributes.of(ServiceAttributes.SERVICE_NAME, SERVICE_NAME));
2929

3030
// Set to process the spans by the Zipkin Exporter
3131
SdkTracerProvider tracerProvider =

jaeger/src/main/java/io/opentelemetry/example/jaeger/ExampleConfiguration.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@
55

66
package io.opentelemetry.example.jaeger;
77

8+
import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_NAME;
9+
810
import io.opentelemetry.api.OpenTelemetry;
911
import io.opentelemetry.api.common.Attributes;
1012
import io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporter;
1113
import io.opentelemetry.sdk.OpenTelemetrySdk;
1214
import io.opentelemetry.sdk.resources.Resource;
1315
import io.opentelemetry.sdk.trace.SdkTracerProvider;
1416
import io.opentelemetry.sdk.trace.export.BatchSpanProcessor;
15-
import io.opentelemetry.semconv.ResourceAttributes;
1617
import java.util.concurrent.TimeUnit;
1718

1819
/**
@@ -37,7 +38,7 @@ static OpenTelemetry initOpenTelemetry(String jaegerEndpoint) {
3738
.build();
3839

3940
Resource serviceNameResource =
40-
Resource.create(Attributes.of(ResourceAttributes.SERVICE_NAME, "otel-jaeger-example"));
41+
Resource.create(Attributes.of(SERVICE_NAME, "otel-jaeger-example"));
4142

4243
// Set to process the spans by the Jaeger Exporter
4344
SdkTracerProvider tracerProvider =

log-appender/src/main/java/io/opentelemetry/example/logappender/Application.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package io.opentelemetry.example.logappender;
22

3+
import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_NAME;
4+
35
import io.opentelemetry.api.GlobalOpenTelemetry;
46
import io.opentelemetry.api.OpenTelemetry;
57
import io.opentelemetry.api.common.AttributeKey;
@@ -13,7 +15,6 @@
1315
import io.opentelemetry.sdk.resources.Resource;
1416
import io.opentelemetry.sdk.trace.SdkTracerProvider;
1517
import io.opentelemetry.sdk.trace.samplers.Sampler;
16-
import io.opentelemetry.semconv.ResourceAttributes;
1718
import java.util.HashMap;
1819
import java.util.Map;
1920
import java.util.logging.Level;
@@ -115,7 +116,7 @@ private static OpenTelemetry initializeOpenTelemetry() {
115116
SdkLoggerProvider.builder()
116117
.setResource(
117118
Resource.getDefault().toBuilder()
118-
.put(ResourceAttributes.SERVICE_NAME, "log4j-example")
119+
.put(SERVICE_NAME, "log4j-example")
119120
.build())
120121
.addLogRecordProcessor(
121122
BatchLogRecordProcessor.builder(

otlp/src/main/java/io/opentelemetry/example/otlp/ExampleConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
package io.opentelemetry.example.otlp;
77

8-
import static io.opentelemetry.semconv.ResourceAttributes.SERVICE_NAME;
8+
import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_NAME;
99

1010
import io.opentelemetry.api.OpenTelemetry;
1111
import io.opentelemetry.exporter.otlp.metrics.OtlpGrpcMetricExporter;

prometheus/src/main/java/io/opentelemetry/example/prometheus/ExampleConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
package io.opentelemetry.example.prometheus;
77

8-
import static io.opentelemetry.semconv.ResourceAttributes.SERVICE_NAME;
8+
import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_NAME;
99

1010
import io.opentelemetry.api.OpenTelemetry;
1111
import io.opentelemetry.exporter.logging.LoggingSpanExporter;

zipkin/src/main/java/io/opentelemetry/example/zipkin/ExampleConfiguration.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,16 @@
55

66
package io.opentelemetry.example.zipkin;
77

8+
import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_NAME;
9+
810
import io.opentelemetry.api.OpenTelemetry;
911
import io.opentelemetry.api.common.Attributes;
1012
import io.opentelemetry.exporter.zipkin.ZipkinSpanExporter;
1113
import io.opentelemetry.sdk.OpenTelemetrySdk;
1214
import io.opentelemetry.sdk.resources.Resource;
1315
import io.opentelemetry.sdk.trace.SdkTracerProvider;
1416
import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor;
15-
import io.opentelemetry.semconv.ResourceAttributes;
17+
import io.opentelemetry.semconv.ServiceAttributes;
1618

1719
/**
1820
* All SDK management takes place here, away from the instrumentation code, which should only access
@@ -29,7 +31,7 @@ static OpenTelemetry initializeOpenTelemetry(String ip, int port) {
2931
ZipkinSpanExporter zipkinExporter = ZipkinSpanExporter.builder().setEndpoint(endpoint).build();
3032

3133
Resource serviceNameResource =
32-
Resource.create(Attributes.of(ResourceAttributes.SERVICE_NAME, SERVICE_NAME));
34+
Resource.create(Attributes.of(ServiceAttributes.SERVICE_NAME, SERVICE_NAME));
3335

3436
// Set to process the spans by the Zipkin Exporter
3537
SdkTracerProvider tracerProvider =

0 commit comments

Comments
 (0)