Skip to content

Commit

Permalink
deps: updates to latest zipkin versions (#206)
Browse files Browse the repository at this point in the history
See openzipkin/brave#1396 about Propagation and Brave 6.0

Signed-off-by: Adrian Cole <adrian@tetrate.io>
  • Loading branch information
codefromthecrypt authored Jan 7, 2024
1 parent 33b3476 commit 7b8f3e6
Show file tree
Hide file tree
Showing 11 changed files with 21 additions and 18 deletions.
2 changes: 1 addition & 1 deletion benchmarks/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2016-2023 The OpenZipkin Authors
Copyright 2016-2024 The OpenZipkin Authors
Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
in compliance with the License. You may obtain a copy of the License at
Expand Down
2 changes: 1 addition & 1 deletion collector-pubsub/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2016-2023 The OpenZipkin Authors
Copyright 2016-2024 The OpenZipkin Authors
Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
in compliance with the License. You may obtain a copy of the License at
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright 2016-2023 The OpenZipkin Authors
# Copyright 2016-2024 The OpenZipkin Authors
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
# in compliance with the License. You may obtain a copy of the License at
Expand All @@ -13,7 +13,7 @@
#

# zipkin version should match zipkin.version in /pom.xml
ARG zipkin_version=2.25.2
ARG zipkin_version=2.27.0

# java_version is used during the installation process to build or download the module jar.
#
Expand Down
2 changes: 1 addition & 1 deletion module/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2016-2023 The OpenZipkin Authors
Copyright 2016-2024 The OpenZipkin Authors
Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
in compliance with the License. You may obtain a copy of the License at
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2016-2023 The OpenZipkin Authors
Copyright 2016-2024 The OpenZipkin Authors
Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
in compliance with the License. You may obtain a copy of the License at
Expand Down Expand Up @@ -62,8 +62,8 @@
<!-- matching armeria/grpc/zipkin -->
<zipkin.groupId>io.zipkin.zipkin2</zipkin.groupId>
<!-- when updating, update docker/Dockerfile and storage/src/test/java/zipkin2/storage/kafka/IT* -->
<zipkin.version>2.25.2</zipkin.version>
<zipkin-reporter.version>2.17.1</zipkin-reporter.version>
<zipkin.version>2.27.0</zipkin.version>
<zipkin-reporter.version>2.17.2</zipkin-reporter.version>
<spring-boot.version>2.7.18</spring-boot.version>
<!-- armeria.groupId allows you to test feature branches with jitpack -->
<armeria.groupId>com.linecorp.armeria</armeria.groupId>
Expand All @@ -73,7 +73,7 @@
<!-- <brave.groupId>com.github.openzipkin.brave</brave.groupId>-->
<!-- <brave.version>master-SNAPSHOT</brave.version>-->
<brave.groupId>io.zipkin.brave</brave.groupId>
<brave.version>5.17.0</brave.version>
<brave.version>5.17.1</brave.version>

<!-- from armeria-grpc -->
<grpc.version>1.58.0</grpc.version>
Expand Down
2 changes: 1 addition & 1 deletion propagation-stackdriver/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2016-2023 The OpenZipkin Authors
Copyright 2016-2024 The OpenZipkin Authors
Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
in compliance with the License. You may obtain a copy of the License at
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2016-2020 The OpenZipkin Authors
* Copyright 2016-2024 The OpenZipkin Authors
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
* in compliance with the License. You may obtain a copy of the License at
Expand All @@ -13,7 +13,6 @@
*/
package brave.propagation.stackdriver;

import brave.internal.propagation.StringPropagationAdapter;
import brave.propagation.B3Propagation;
import brave.propagation.Propagation;
import brave.propagation.TraceContext;
Expand Down Expand Up @@ -54,8 +53,12 @@ static final class Factory extends Propagation.Factory {
return new StackdriverTracePropagation(primary.get());
}

@Deprecated public <K> Propagation<K> create(KeyFactory<K> keyFactory) {
return StringPropagationAdapter.create(get(), keyFactory);
/**
* @deprecated end users and instrumentation should never call this, and instead use
* {@link #get()}. This only remains to avoid rev-lock upgrading to Brave 6.
*/
@Deprecated public <K> Propagation<K> create(KeyFactory<K> unused) {
throw new UnsupportedOperationException("As of Brave 5.12, call PropagationFactory.get()");
}

@Override public boolean supportsJoin() {
Expand Down
2 changes: 1 addition & 1 deletion sender-pubsub/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2016-2023 The OpenZipkin Authors
Copyright 2016-2024 The OpenZipkin Authors
Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
in compliance with the License. You may obtain a copy of the License at
Expand Down
2 changes: 1 addition & 1 deletion sender-stackdriver/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2016-2023 The OpenZipkin Authors
Copyright 2016-2024 The OpenZipkin Authors
Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
in compliance with the License. You may obtain a copy of the License at
Expand Down
2 changes: 1 addition & 1 deletion storage-stackdriver/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2016-2023 The OpenZipkin Authors
Copyright 2016-2024 The OpenZipkin Authors
Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
in compliance with the License. You may obtain a copy of the License at
Expand Down
2 changes: 1 addition & 1 deletion translation-stackdriver/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2016-2023 The OpenZipkin Authors
Copyright 2016-2024 The OpenZipkin Authors
Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
in compliance with the License. You may obtain a copy of the License at
Expand Down

0 comments on commit 7b8f3e6

Please sign in to comment.