Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ subprojects {

dependencies {
// using the bom ensures that all of your opentelemetry dependency versions are aligned
implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.12.0-alpha"))
implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.13.0-alpha"))
}

spotless {
Expand Down
2 changes: 1 addition & 1 deletion doc-snippets/exporters/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ val moduleName by extra { "io.opentelemetry.examples.docs.exporters" }

dependencies {
implementation(platform(SpringBootPlugin.BOM_COORDINATES))
implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.12.0"))
implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.13.0"))

implementation("org.springframework.boot:spring-boot-starter-web")
implementation("io.opentelemetry:opentelemetry-exporter-otlp")
Expand Down
2 changes: 1 addition & 1 deletion doc-snippets/getting-started/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ val moduleName by extra { "io.opentelemetry.examples.docs.getting-started" }

dependencies {
implementation(platform(SpringBootPlugin.BOM_COORDINATES))
implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.12.0"))
implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.13.0"))

implementation("org.springframework.boot:spring-boot-starter-web")
}
2 changes: 1 addition & 1 deletion doc-snippets/spring-starter/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ val moduleName by extra { "io.opentelemetry.examples.docs.spring-starter" }

dependencies {
implementation(platform(SpringBootPlugin.BOM_COORDINATES))
implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.12.0"))
implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.13.0"))

implementation("org.springframework.boot:spring-boot-starter-web")
implementation("org.springframework.boot:spring-boot-starter-webflux")
Expand Down
2 changes: 1 addition & 1 deletion grpc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ dependencies {
implementation ("io.grpc:grpc-services:${grpcVersion}")
implementation ("io.grpc:grpc-stub:${grpcVersion}")
implementation ("com.google.protobuf:protobuf-java-util:${protobufVersion}")
implementation ("io.opentelemetry.instrumentation:opentelemetry-grpc-1.6:2.12.0-alpha")
implementation ("io.opentelemetry.instrumentation:opentelemetry-grpc-1.6:2.13.0-alpha")
implementation ("com.google.guava:guava:33.4.0-jre")

implementation("io.opentelemetry:opentelemetry-api")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import io.opentelemetry.sdk.resources.Resource;
import io.opentelemetry.sdk.trace.SdkTracerProvider;
import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor;
import io.opentelemetry.semconv.ResourceAttributes;
import io.opentelemetry.semconv.ServiceAttributes;

public final class ExampleConfiguration {

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

Resource serviceNameResource =
Resource.create(Attributes.of(ResourceAttributes.SERVICE_NAME, SERVICE_NAME));
Resource.create(Attributes.of(ServiceAttributes.SERVICE_NAME, SERVICE_NAME));

// Set to process the spans by the Zipkin Exporter
SdkTracerProvider tracerProvider =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@

package io.opentelemetry.example.jaeger;

import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_NAME;

import io.opentelemetry.api.OpenTelemetry;
import io.opentelemetry.api.common.Attributes;
import io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporter;
import io.opentelemetry.sdk.OpenTelemetrySdk;
import io.opentelemetry.sdk.resources.Resource;
import io.opentelemetry.sdk.trace.SdkTracerProvider;
import io.opentelemetry.sdk.trace.export.BatchSpanProcessor;
import io.opentelemetry.semconv.ResourceAttributes;
import java.util.concurrent.TimeUnit;

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

Resource serviceNameResource =
Resource.create(Attributes.of(ResourceAttributes.SERVICE_NAME, "otel-jaeger-example"));
Resource.create(Attributes.of(SERVICE_NAME, "otel-jaeger-example"));

// Set to process the spans by the Jaeger Exporter
SdkTracerProvider tracerProvider =
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package io.opentelemetry.example.logappender;

import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_NAME;

import io.opentelemetry.api.GlobalOpenTelemetry;
import io.opentelemetry.api.OpenTelemetry;
import io.opentelemetry.api.common.AttributeKey;
Expand All @@ -13,7 +15,6 @@
import io.opentelemetry.sdk.resources.Resource;
import io.opentelemetry.sdk.trace.SdkTracerProvider;
import io.opentelemetry.sdk.trace.samplers.Sampler;
import io.opentelemetry.semconv.ResourceAttributes;
import java.util.HashMap;
import java.util.Map;
import java.util.logging.Level;
Expand Down Expand Up @@ -115,7 +116,7 @@ private static OpenTelemetry initializeOpenTelemetry() {
SdkLoggerProvider.builder()
.setResource(
Resource.getDefault().toBuilder()
.put(ResourceAttributes.SERVICE_NAME, "log4j-example")
.put(SERVICE_NAME, "log4j-example")
.build())
.addLogRecordProcessor(
BatchLogRecordProcessor.builder(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

package io.opentelemetry.example.otlp;

import static io.opentelemetry.semconv.ResourceAttributes.SERVICE_NAME;
import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_NAME;

import io.opentelemetry.api.OpenTelemetry;
import io.opentelemetry.exporter.otlp.metrics.OtlpGrpcMetricExporter;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

package io.opentelemetry.example.prometheus;

import static io.opentelemetry.semconv.ResourceAttributes.SERVICE_NAME;
import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_NAME;

import io.opentelemetry.api.OpenTelemetry;
import io.opentelemetry.exporter.logging.LoggingSpanExporter;
Expand Down
2 changes: 1 addition & 1 deletion spring-native/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ val moduleName by extra { "io.opentelemetry.examples.native" }

dependencies {
implementation(platform(SpringBootPlugin.BOM_COORDINATES))
implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.12.0"))
implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.13.0"))
implementation("org.springframework.boot:spring-boot-starter-actuator")
implementation("org.springframework.boot:spring-boot-starter-web")
implementation("org.springframework.boot:spring-boot-starter-data-jdbc")
Expand Down
2 changes: 1 addition & 1 deletion telemetry-testing/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ val bootJar = tasks.named<BootJar>("bootJar") {
dependencies {
implementation(platform(SpringBootPlugin.BOM_COORDINATES))
implementation("io.opentelemetry:opentelemetry-api")
implementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:2.12.0")
implementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:2.13.0")
//spring modules
implementation("org.springframework.boot:spring-boot-starter-web")
testImplementation("org.springframework.boot:spring-boot-starter-test")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,16 @@

package io.opentelemetry.example.zipkin;

import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_NAME;

import io.opentelemetry.api.OpenTelemetry;
import io.opentelemetry.api.common.Attributes;
import io.opentelemetry.exporter.zipkin.ZipkinSpanExporter;
import io.opentelemetry.sdk.OpenTelemetrySdk;
import io.opentelemetry.sdk.resources.Resource;
import io.opentelemetry.sdk.trace.SdkTracerProvider;
import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor;
import io.opentelemetry.semconv.ResourceAttributes;
import io.opentelemetry.semconv.ServiceAttributes;

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

Resource serviceNameResource =
Resource.create(Attributes.of(ResourceAttributes.SERVICE_NAME, SERVICE_NAME));
Resource.create(Attributes.of(ServiceAttributes.SERVICE_NAME, SERVICE_NAME));

// Set to process the spans by the Zipkin Exporter
SdkTracerProvider tracerProvider =
Expand Down
Loading