Visitar URL original
Upgrade opentelemetry and opencensus version to latest · CMLL/sqlcommenter@047603b · GitHub
Skip to content

Commit 047603b

Browse files
dolphin1999dolphin1999
committed
Upgrade opentelemetry and opencensus version to latest
1 parent 0427da3 commit 047603b

3 files changed

Lines changed: 11 additions & 11 deletions

File tree

‎java/sqlcommenter-java/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ apply plugin: "jacoco"
1010
apply plugin: "signing"
1111

1212
group = "com.google.cloud"
13-
version = "1.0.0" // CURRENT_VERSION
13+
version = "1.1.0" // CURRENT_VERSION
1414

1515
sourceCompatibility = 1.8
1616
targetCompatibility = 1.8
@@ -41,10 +41,10 @@ buildscript {
4141
}
4242

4343

44-
def opencensusVersion = '0.22.1'
44+
def opencensusVersion = '0.28.3'
4545
def errorProneVersion = '2.3.2'
4646
def findBugsJsr305Version = '3.0.2'
47-
def opentelemetryVersion = '0.12.0'
47+
def opentelemetryVersion = '1.5.0'
4848

4949

5050
dependencies {

‎java/sqlcommenter-java/src/main/java/com/google/cloud/sqlcommenter/threadlocalstorage/SpanContextMetadata.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ public static SpanContextMetadata fromOpenTelemetryContext(
6666
return null;
6767
}
6868

69-
String traceId = spanContext.getTraceIdAsHexString();
70-
String spanId = spanContext.getSpanIdAsHexString();
71-
byte traceOptions = spanContext.getTraceFlags();
69+
String traceId = spanContext.getTraceId();
70+
String spanId = spanContext.getSpanId();
71+
byte traceOptions = spanContext.getTraceFlags().asByte();
7272

7373
io.opentelemetry.api.trace.TraceState traceState = spanContext.getTraceState();
7474

‎java/sqlcommenter-java/src/test/java/com/google/cloud/sqlcommenter/schibernate/SCHibernateTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import com.google.cloud.sqlcommenter.threadlocalstorage.State;
2020
import io.opencensus.trace.samplers.Samplers;
21-
import io.opentelemetry.sdk.trace.TracerSdkProvider;
21+
import io.opentelemetry.sdk.trace.SdkTracerProvider;
2222
import org.junit.After;
2323
import org.junit.BeforeClass;
2424
import org.junit.Test;
@@ -102,7 +102,7 @@ public void testWithOpenTelemetryContext() {
102102
State.Holder.set(state1);
103103

104104
io.opentelemetry.api.trace.Tracer tracer =
105-
TracerSdkProvider.builder().build().get("SCHibernateTest");
105+
SdkTracerProvider.builder().build().get("SCHibernateTest");
106106
// 2. Now insert a span and assert that the SQL has that OpenTelemetry Trace information.
107107
io.opentelemetry.api.trace.Span span = tracer.spanBuilder("TestSpan").startSpan();
108108
try (io.opentelemetry.context.Scope ss = span.makeCurrent()) {
@@ -114,9 +114,9 @@ public void testWithOpenTelemetryContext() {
114114
String.format(
115115
"SELECT * from FOO /*action='may',controller='baz',framework='jetty',traceparent='%s-%s-%s-%02X'*/",
116116
State.W3C_CONTEXT_VERSION,
117-
spanContext.getTraceIdAsHexString(),
118-
spanContext.getSpanIdAsHexString(),
119-
spanContext.getTraceFlags());
117+
spanContext.getTraceId(),
118+
spanContext.getSpanId(),
119+
spanContext.getTraceFlags().asByte());
120120

121121
assertThat(got).isEqualTo(want3);
122122
} finally {

0 commit comments

Comments
 (0)