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

otel update without bom #401

Closed
wants to merge 11 commits into from
Closed

otel update without bom #401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
702b408
otel update without bom
Jan 23, 2024
f0f439d
update
Jan 23, 2024
ad498e5
update
Jan 23, 2024
52da29f
update
Jan 23, 2024
af92a93
try
Jan 23, 2024
40e4af1
try
Jan 23, 2024
d25c176
try
Jan 23, 2024
b627b67
try
Jan 23, 2024
99786fb
try
Jan 23, 2024
f26cbe7
try
Jan 23, 2024
472fd46
try
Jan 23, 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
12 changes: 6 additions & 6 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,14 @@ subprojects {
extra.set("versions", mapOf(
// when updating these values, some values must also be updated in buildSrc as this map
// cannot be accessed there
"opentelemetry" to "1.24.0",
"opentelemetry_semconv" to "1.24.0-alpha",
"opentelemetry" to "1.32.0",
"opentelemetry_semconv" to "1.21.0-alpha",
"opentelemetry_proto" to "0.11.0-alpha",
"opentelemetry_java_agent" to "1.24.0-alpha",
"opentelemetry_java_agent_all" to "1.24.0",
"opentelemetry_java_agent-tooling" to "1.24.0-alpha",
"opentelemetry_java_agent" to "1.32.0-alpha",
"opentelemetry_java_agent_all" to "1.32.0",
"opentelemetry_java_agent-tooling" to "1.32.0-alpha",

"opentelemetry_gradle_plugin" to "1.24.0-alpha",
"opentelemetry_gradle_plugin" to "1.32.0-alpha",
"byte_buddy" to "1.12.10",
"slf4j" to "2.0.7"
))
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ tasks {
dependencies {
compileOnly(gradleApi())
implementation(localGroovy())
val otelInstrumentationVersion = "1.24.0-alpha"
val otelInstrumentationVersion = "1.32.0-alpha"
implementation("io.opentelemetry.javaagent:opentelemetry-muzzle:$otelInstrumentationVersion")
implementation("io.opentelemetry.instrumentation.muzzle-generation:io.opentelemetry.instrumentation.muzzle-generation.gradle.plugin:$otelInstrumentationVersion")
implementation("io.opentelemetry.instrumentation.muzzle-check:io.opentelemetry.instrumentation.muzzle-check.gradle.plugin:$otelInstrumentationVersion")
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/apache-httpasyncclient-4.1/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ dependencies {

implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-apache-httpasyncclient-4.1:${versions["opentelemetry_java_agent"]}")
testImplementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-apache-httpclient-4.0:${versions["opentelemetry_java_agent"]}")
testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv:${versions["opentelemetry_semconv"]}")
testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv:${versions["opentelemetry_java_agent"]}")
library("org.apache.httpcomponents:httpasyncclient:4.1")
testImplementation(testFixtures(project(":testing-common")))
}
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/apache-httpclient-4.0/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,5 @@ dependencies {
library("org.apache.httpcomponents:httpclient:4.0")

testImplementation(testFixtures(project(":testing-common")))
testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv:${versions["opentelemetry_semconv"]}")
testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv:${versions["opentelemetry_java_agent"]}")
}
4 changes: 2 additions & 2 deletions instrumentation/jaxrs-client-2.0/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ val versions: Map<String, String> by extra

dependencies {
api(project(":instrumentation:java-streams"))
api("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-http-url-connection:1.24.0-alpha")
api("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-http-url-connection:${versions["opentelemetry_java_agent"]}")

compileOnly("javax.ws.rs:javax.ws.rs-api:2.0.1")

testImplementation(testFixtures(project(":testing-common")))
testImplementation("org.glassfish.jersey.core:jersey-client:2.27")
testImplementation("org.glassfish.jersey.inject:jersey-hk2:2.27")
testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv:${versions["opentelemetry_semconv"]}")
testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv:${versions["opentelemetry_java_agent"]}")

testImplementation(project(":instrumentation:apache-httpclient-4.0"))
testImplementation(files(project(":instrumentation:apache-httpclient-4.0").dependencyProject.sourceSets.main.map { it.output }))
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/micronaut-1.0/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ dependencies {
testImplementation("io.micronaut:micronaut-inject:${micronautVersion}")
testImplementation("io.micronaut:micronaut-http-client:${micronautVersion}")
testAnnotationProcessor("io.micronaut:micronaut-inject-java:${micronautVersion}")
testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv:${versions["opentelemetry_semconv"]}")
testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv:${versions["opentelemetry_java_agent"]}")
testImplementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-netty-4.1:${versions["opentelemetry_java_agent"]}")
}

Expand Down
2 changes: 1 addition & 1 deletion instrumentation/micronaut-3.0/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ dependencies {
testImplementation("io.micronaut.rxjava2:micronaut-rxjava2:1.1.0")
testImplementation("io.micronaut.rxjava2:micronaut-rxjava2-http-server-netty:1.1.0")
testImplementation("io.micronaut.rxjava2:micronaut-rxjava2-http-client:1.1.0")
testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv:${versions["opentelemetry_semconv"]}")
testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv:${versions["opentelemetry_java_agent"]}")
testImplementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-netty-4.1:${versions["opentelemetry_java_agent"]}")
}
4 changes: 2 additions & 2 deletions instrumentation/netty/netty-4.0/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ dependencies {
implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-netty-4.0:${versions["opentelemetry_java_agent"]}")
implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-netty-4-common:${versions["opentelemetry_java_agent"]}")
implementation("io.opentelemetry.instrumentation:opentelemetry-netty-4-common:${versions["opentelemetry_java_agent"]}")
implementation("io.opentelemetry:opentelemetry-semconv:${versions["opentelemetry_semconv"]}")
implementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv:${versions["opentelemetry_semconv"]}")
implementation("io.opentelemetry.semconv:opentelemetry-semconv:${versions["opentelemetry_semconv"]}")
implementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv:${versions["opentelemetry_java_agent"]}")
compileOnly("io.netty:netty-codec-http:${nettyVersion}") {
version {
strictly(nettyVersion)
Expand Down
4 changes: 2 additions & 2 deletions ...aagent/instrumentation/hypertrace/netty/v4_0/client/HttpClientResponseTracingHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
import io.opentelemetry.javaagent.instrumentation.hypertrace.netty.v4_0.AttributeKeys;
import io.opentelemetry.javaagent.instrumentation.hypertrace.netty.v4_0.DataCaptureUtils;
import io.opentelemetry.javaagent.instrumentation.netty.v4_0.client.NettyClientSingletons;
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
import io.opentelemetry.semconv.SemanticAttributes;
import java.nio.charset.Charset;
import java.util.Map;
import org.hypertrace.agent.core.config.InstrumentationConfig;
Expand Down Expand Up @@ -101,7 +101,7 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) {
if (msg instanceof HttpResponse) {
HttpResponse httpResponse = (HttpResponse) msg;
int code = httpResponse.getStatus().code();
span.setAttribute(SemanticAttributes.HTTP_STATUS_CODE, code);
span.setAttribute(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, code);
span.setStatus(code >= 100 && code < 400 ? StatusCode.UNSET : StatusCode.ERROR);
}
if (msg instanceof LastHttpContent) {
Expand Down
4 changes: 2 additions & 2 deletions ...aagent/instrumentation/hypertrace/netty/v4_0/server/HttpServerResponseTracingHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
import io.opentelemetry.javaagent.instrumentation.hypertrace.netty.v4_0.AttributeKeys;
import io.opentelemetry.javaagent.instrumentation.hypertrace.netty.v4_0.DataCaptureUtils;
import io.opentelemetry.javaagent.instrumentation.netty.v4_0.server.NettyServerSingletons;
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
import io.opentelemetry.semconv.SemanticAttributes;
import java.nio.charset.Charset;
import java.util.Map;
import org.hypertrace.agent.core.config.InstrumentationConfig;
Expand Down Expand Up @@ -100,7 +100,7 @@ public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise prm) {
if (msg instanceof HttpResponse) {
HttpResponse httpResponse = (HttpResponse) msg;
int code = httpResponse.getStatus().code();
span.setAttribute(SemanticAttributes.HTTP_STATUS_CODE, code);
span.setAttribute(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, code);
span.setStatus(code >= 100 && code < 500 ? StatusCode.UNSET : StatusCode.ERROR);
}
if (msg instanceof LastHttpContent) {
Expand Down
4 changes: 2 additions & 2 deletions instrumentation/netty/netty-4.1/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ dependencies {
implementation("io.opentelemetry.instrumentation:opentelemetry-netty-4-common:${versions["opentelemetry_java_agent"]}")
implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-netty-4.1:${versions["opentelemetry_java_agent"]}")
implementation("io.opentelemetry.instrumentation:opentelemetry-netty-4.1:${versions["opentelemetry_java_agent"]}")
implementation("io.opentelemetry:opentelemetry-semconv:${versions["opentelemetry_semconv"]}")
implementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv:${versions["opentelemetry_semconv"]}")
implementation("io.opentelemetry.semconv:opentelemetry-semconv:${versions["opentelemetry_semconv"]}")
implementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv:${versions["opentelemetry_java_agent"]}")
library("io.netty:netty-codec-http:4.1.0.Final")

testImplementation(testFixtures(project(":testing-common")))
Expand Down
4 changes: 2 additions & 2 deletions ...aagent/instrumentation/hypertrace/netty/v4_1/client/HttpClientResponseTracingHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
import io.opentelemetry.javaagent.instrumentation.hypertrace.netty.v4_1.AttributeKeys;
import io.opentelemetry.javaagent.instrumentation.hypertrace.netty.v4_1.DataCaptureUtils;
import io.opentelemetry.javaagent.instrumentation.netty.v4_1.NettyClientSingletons;
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
import io.opentelemetry.semconv.SemanticAttributes;
import java.nio.charset.Charset;
import java.util.Map;
import org.hypertrace.agent.core.config.InstrumentationConfig;
Expand Down Expand Up @@ -100,7 +100,7 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) {
if (msg instanceof HttpResponse) {
HttpResponse httpResponse = (HttpResponse) msg;
int code = httpResponse.status().code();
span.setAttribute(SemanticAttributes.HTTP_STATUS_CODE, code);
span.setAttribute(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, code);
span.setStatus(code >= 100 && code < 400 ? StatusCode.UNSET : StatusCode.ERROR);
}
if (msg instanceof LastHttpContent) {
Expand Down
8 changes: 6 additions & 2 deletions ...aagent/instrumentation/hypertrace/netty/v4_1/server/HttpServerBlockingRequestHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,10 @@
import io.opentelemetry.api.trace.Span;
import io.opentelemetry.context.Context;
import io.opentelemetry.instrumentation.netty.v4.common.HttpRequestAndChannel;
import io.opentelemetry.instrumentation.netty.v4_1.internal.ServerContext;
import io.opentelemetry.javaagent.instrumentation.hypertrace.netty.v4_1.AttributeKeys;
import java.nio.charset.StandardCharsets;
import java.util.Deque;
import java.util.Map;
import org.hypertrace.agent.core.filter.FilterResult;
import org.hypertrace.agent.filter.FilterRegistry;
Expand All @@ -41,10 +43,12 @@ public class HttpServerBlockingRequestHandler extends ChannelInboundHandlerAdapt
@Override
public void channelRead(ChannelHandlerContext ctx, Object msg) {
Channel channel = ctx.channel();
Context context =
channel
Deque<ServerContext> serverContexts =
ctx.channel()
.attr(io.opentelemetry.instrumentation.netty.v4_1.internal.AttributeKeys.SERVER_CONTEXT)
.get();
ServerContext serverContext = serverContexts != null ? serverContexts.peekFirst() : null;
Context context = serverContext != null ? serverContext.context() : null;
if (context == null) {
ctx.fireChannelRead(msg);
return;
Expand Down
8 changes: 6 additions & 2 deletions ...vaagent/instrumentation/hypertrace/netty/v4_1/server/HttpServerRequestTracingHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,11 @@
import io.opentelemetry.api.common.AttributeKey;
import io.opentelemetry.api.trace.Span;
import io.opentelemetry.context.Context;
import io.opentelemetry.instrumentation.netty.v4_1.internal.ServerContext;
import io.opentelemetry.javaagent.instrumentation.hypertrace.netty.v4_1.AttributeKeys;
import io.opentelemetry.javaagent.instrumentation.hypertrace.netty.v4_1.DataCaptureUtils;
import java.nio.charset.Charset;
import java.util.Deque;
import java.util.HashMap;
import java.util.Map;
import org.hypertrace.agent.core.config.InstrumentationConfig;
Expand All @@ -48,10 +50,12 @@ public class HttpServerRequestTracingHandler extends ChannelInboundHandlerAdapte
@Override
public void channelRead(ChannelHandlerContext ctx, Object msg) {
Channel channel = ctx.channel();
Context context =
channel
Deque<ServerContext> serverContexts =
ctx.channel()
.attr(io.opentelemetry.instrumentation.netty.v4_1.internal.AttributeKeys.SERVER_CONTEXT)
.get();
ServerContext serverContext = serverContexts != null ? serverContexts.peekFirst() : null;
Context context = serverContext != null ? serverContext.context() : null;
if (context == null) {
ctx.fireChannelRead(msg);
return;
Expand Down
11 changes: 8 additions & 3 deletions ...aagent/instrumentation/hypertrace/netty/v4_1/server/HttpServerResponseTracingHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,13 @@
import io.opentelemetry.api.trace.StatusCode;
import io.opentelemetry.context.Context;
import io.opentelemetry.context.Scope;
import io.opentelemetry.instrumentation.netty.v4_1.internal.ServerContext;
import io.opentelemetry.javaagent.instrumentation.hypertrace.netty.v4_1.AttributeKeys;
import io.opentelemetry.javaagent.instrumentation.hypertrace.netty.v4_1.DataCaptureUtils;
import io.opentelemetry.javaagent.instrumentation.netty.v4_1.NettyServerSingletons;
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
import io.opentelemetry.semconv.SemanticAttributes;
import java.nio.charset.Charset;
import java.util.Deque;
import java.util.Map;
import org.hypertrace.agent.core.config.InstrumentationConfig;
import org.hypertrace.agent.core.instrumentation.HypertraceSemanticAttributes;
Expand All @@ -50,10 +52,13 @@ public class HttpServerResponseTracingHandler extends ChannelOutboundHandlerAdap

@Override
public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise prm) {
Context context =
Deque<ServerContext> serverContexts =
ctx.channel()
.attr(io.opentelemetry.instrumentation.netty.v4_1.internal.AttributeKeys.SERVER_CONTEXT)
.get();
ServerContext serverContext = serverContexts != null ? serverContexts.peekFirst() : null;
Context context = serverContext != null ? serverContext.context() : null;

if (context == null) {
ctx.write(msg, prm);
return;
Expand Down Expand Up @@ -99,7 +104,7 @@ public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise prm) {
if (msg instanceof HttpResponse) {
HttpResponse httpResponse = (HttpResponse) msg;
int code = httpResponse.status().code();
span.setAttribute(SemanticAttributes.HTTP_STATUS_CODE, code);
span.setAttribute(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, code);
span.setStatus(code >= 100 && code < 500 ? StatusCode.UNSET : StatusCode.ERROR);
}
if (msg instanceof LastHttpContent) {
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/servlet/servlet-3.0/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,5 +47,5 @@ dependencies {
}
testImplementation("org.eclipse.jetty:jetty-server:8.1.22.v20160922")
testImplementation("org.eclipse.jetty:jetty-servlet:8.1.22.v20160922")
testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv:${versions["opentelemetry_semconv"]}")
testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv:${versions["opentelemetry_java_agent"]}")
}
2 changes: 1 addition & 1 deletion instrumentation/spark-2.3/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,5 @@ dependencies {
testImplementation(files(project(":instrumentation:servlet:servlet-rw").dependencyProject.sourceSets.main.map { it.output }))
testImplementation(testFixtures(project(":testing-common")))
testImplementation("com.sparkjava:spark-core:2.3")
testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv:${versions["opentelemetry_semconv"]}")
testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv:${versions["opentelemetry_java_agent"]}")
}
2 changes: 1 addition & 1 deletion instrumentation/spring/spring-webflux-5.0/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ dependencies {
testImplementation("org.springframework.boot:spring-boot-starter-webflux:2.0.0.RELEASE")
testImplementation("org.springframework.boot:spring-boot-starter-test:2.0.0.RELEASE")
testImplementation("org.springframework.boot:spring-boot-starter-reactor-netty:2.0.0.RELEASE")
testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv:${versions["opentelemetry_semconv"]}")
testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv:${versions["opentelemetry_java_agent"]}")
}
2 changes: 1 addition & 1 deletion instrumentation/struts-2.3/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ dependencies {
testImplementation("org.eclipse.jetty:jetty-servlet:8.0.0.v20110901")
testImplementation("javax.servlet:javax.servlet-api:3.0.1")
testImplementation("javax.servlet:jsp-api:2.0")
testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv:${versions["opentelemetry_semconv"]}")
testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv:${versions["opentelemetry_java_agent"]}")
}
2 changes: 1 addition & 1 deletion instrumentation/undertow/undertow-1.4/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ dependencies {
testImplementation(testFixtures(project(":testing-common")))
testImplementation("javax.servlet:javax.servlet-api:3.1.0")
testImplementation("io.undertow:undertow-servlet:2.0.0.Final")
testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv:${versions["opentelemetry_semconv"]}")
testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv:${versions["opentelemetry_java_agent"]}")
testRuntimeOnly(project(":instrumentation:servlet:servlet-3.0"))
testRuntimeOnly(project(":instrumentation:undertow:undertow-servlet-1.4"))
testRuntimeOnly("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-common-bootstrap:${versions["opentelemetry_java_agent"]}")
Expand Down
6 changes: 3 additions & 3 deletions otel-extensions/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ dependencies {
api(project(":filter-api"))

compileOnly("io.opentelemetry:opentelemetry-sdk:${versions["opentelemetry"]}")
compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:${versions["opentelemetry"]}-alpha")
compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:${versions["opentelemetry"]}")
compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:${versions["opentelemetry"]}")

implementation("io.opentelemetry:opentelemetry-semconv:${versions["opentelemetry"]}-alpha")
implementation("io.opentelemetry.semconv:opentelemetry-semconv:${versions["opentelemetry_semconv"]}")
implementation("io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api:${versions["opentelemetry_java_agent"]}")
implementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:${versions["opentelemetry"]}")
implementation("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:${versions["opentelemetry_java_agent-tooling"]}") {
Expand Down Expand Up @@ -65,6 +65,6 @@ dependencies {
api("com.google.code.gson:gson:2.8.9")
}

testImplementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:${versions["opentelemetry"]}-alpha")
testImplementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:${versions["opentelemetry"]}")
testImplementation("io.opentelemetry:opentelemetry-sdk:${versions["opentelemetry"]}")
}
2 changes: 1 addition & 1 deletion ...nsions/src/main/java/org/hypertrace/agent/otel/extensions/HypertraceResourceProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider;
import io.opentelemetry.sdk.resources.Resource;
import io.opentelemetry.semconv.resource.attributes.ResourceAttributes;
import io.opentelemetry.semconv.ResourceAttributes;
import org.hypertrace.agent.config.v1.Config.AgentConfig;
import org.hypertrace.agent.otel.extensions.config.HypertraceConfig;
import org.slf4j.Logger;
Expand Down
2 changes: 1 addition & 1 deletion ...ns/src/main/java/org/hypertrace/agent/otel/extensions/processor/AddTagsSpanProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import io.opentelemetry.sdk.trace.ReadWriteSpan;
import io.opentelemetry.sdk.trace.ReadableSpan;
import io.opentelemetry.sdk.trace.SpanProcessor;
import io.opentelemetry.semconv.resource.attributes.ResourceAttributes;
import io.opentelemetry.semconv.ResourceAttributes;
import org.hypertrace.agent.otel.extensions.CgroupsReader;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down
Loading
Loading