Skip to content

Commit

Permalink
Remove pinned dependencies on main (1.2.0)
Browse files Browse the repository at this point in the history
Closes gh-304
  • Loading branch information
jonatan-ivanov committed Jul 7, 2023
1 parent 6206f07 commit 0b43a4b
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 12 deletions.
18 changes: 9 additions & 9 deletions dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ def VERSIONS = [
'javax.servlet:javax.servlet-api:latest.release',
'jakarta.platform:jakarta.jakartaee-web-api:9.+',

'io.micrometer:context-propagation:1.0.3',
'io.micrometer:context-propagation:latest.release',

'aopalliance:aopalliance:1.0',
'org.aspectj:aspectjweaver:1.8.+',
Expand All @@ -14,12 +14,12 @@ def VERSIONS = [
'org.apache.logging.log4j:log4j-core:2.+',
'org.slf4j:slf4j-api:1.7.+',
// otel
'io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv:1.24.+',
'io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv:1.+',
// zipkin
'io.zipkin.aws:brave-propagation-aws:latest.release',
// wavefront
'com.wavefront:wavefront-sdk-java:3.0.+',
'com.wavefront:wavefront-internal-reporter-java:1.7.+',
'com.wavefront:wavefront-sdk-java:3.+',
'com.wavefront:wavefront-internal-reporter-java:1.+',
// test
'org.assertj:assertj-core:latest.release',
'org.awaitility:awaitility:latest.release',
Expand All @@ -32,15 +32,15 @@ def VERSIONS = [
]

def MICROMETER_PLATFORM_VERSIONS = [
'io.micrometer:micrometer-bom:1.11.2-SNAPSHOT'
'io.micrometer:micrometer-bom:1.12.0-SNAPSHOT'
]

def PLATFORM_VERSIONS = [
'io.zipkin.brave:brave-bom:5.14.+',
'io.zipkin.brave:brave-bom:5.+',
// opentelemetry-instrumentation-api dependency above with this
'io.opentelemetry:opentelemetry-bom:1.25.+',
'io.opentelemetry:opentelemetry-bom-alpha:1.25.+',
'io.projectreactor:reactor-bom:2022.0.8',
'io.opentelemetry:opentelemetry-bom:1.+',
'io.opentelemetry:opentelemetry-bom-alpha:1.+',
'io.projectreactor:reactor-bom:latest.release',
'org.junit:junit-bom:5.9.+'
]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,12 @@ public String getUrl(HttpClientRequest httpClientRequest) {
return httpClientRequest.url();
}

/**
* @deprecated This method was removed from OpenTelemetry. It should not be used since
* always returned null in Micrometer Tracing.
*/
@Nullable
@Override
@Deprecated
public String getFlavor(HttpClientRequest httpClientRequest, @Nullable HttpClientResponse httpClientResponse) {
return null;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,12 @@
public class DefaultHttpServerAttributesExtractor
implements HttpServerAttributesGetter<HttpServerRequest, HttpServerResponse> {

/**
* @deprecated This method was removed from OpenTelemetry. It should not be used since
* always returned null in Micrometer Tracing.
*/
@Nullable
@Override
@Deprecated
public String getFlavor(HttpServerRequest httpServerRequest) {
return null;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

import io.micrometer.common.lang.Nullable;
import io.micrometer.tracing.http.HttpServerRequest;
import io.micrometer.tracing.http.HttpServerResponse;
import io.opentelemetry.instrumentation.api.instrumenter.net.NetServerAttributesGetter;

import java.net.URI;
Expand All @@ -26,7 +27,8 @@
*
* @author Nikita Salnikov-Tarnovski
*/
class HttpRequestNetServerAttributesExtractor implements NetServerAttributesGetter<HttpServerRequest> {
class HttpRequestNetServerAttributesExtractor
implements NetServerAttributesGetter<HttpServerRequest, HttpServerResponse> {

@Nullable
@Override
Expand Down

0 comments on commit 0b43a4b

Please sign in to comment.