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

fixes issues around missing gson and armeria decoration #205

Merged
merged 1 commit into from
Dec 18, 2023
Merged

fixes issues around missing gson and armeria decoration #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions build-bin/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ configuration settings.
[docker-compose-zipkin-gcp.xml] ensures GCP authentication works. It is not run on pull request, as
the required secure variable is only available on master push.

[//]: # (Below here should be standard for all projects)

## Build Overview
`build-bin` holds portable scripts used in CI to test and deploy the project.
Expand Down
4 changes: 2 additions & 2 deletions build-bin/docker-compose-zipkin-gcp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ volumes:
gcp-service-account:
services:
extract-service-account:
image: ghcr.io/openzipkin/alpine:3.12.1
image: ghcr.io/openzipkin/alpine:3.19.0
volumes:
- gcp-service-account:/credentials:rw
command: -c 'echo $GOOGLE_APPLICATION_CREDENTIALS_BASE64 | base64 -d > /credentials/service-account-key.json'
environment:
- GOOGLE_APPLICATION_CREDENTIALS_BASE64
show-service-account:
image: ghcr.io/openzipkin/alpine:3.12.1
image: ghcr.io/openzipkin/alpine:3.19.0
volumes:
- gcp-service-account:/credentials:ro
# Show that the file exists as a sanity check in logs.
Expand Down
2 changes: 1 addition & 1 deletion module/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@
<classifier>module</classifier>
<!-- https://github.com/spring-projects/spring-boot/issues/3426 transitive exclude doesn't work -->
<excludeGroupIds>
${zipkin.groupId},org.springframework.boot,org.springframework,com.fasterxml.jackson.core,com.google.auto.value,com.google.code.gson,org.reactivestreams,com.google.code.findbugs,javax.annotation,org.slf4j,io.netty,io.micrometer,org.hdrhistogram,org.latencyutils,${armeria.groupId},javax.inject,com.fasterxml.jackson.datatype
${zipkin.groupId},org.springframework.boot,org.springframework,com.fasterxml.jackson.core,com.google.auto.value,org.reactivestreams,com.google.code.findbugs,javax.annotation,org.slf4j,io.netty,io.micrometer,org.hdrhistogram,org.latencyutils,${armeria.groupId},javax.inject,com.fasterxml.jackson.datatype
</excludeGroupIds>
<excludes>
<!-- zipkin-server depends on armeria and its grpc protocol-->
Expand Down
3 changes: 2 additions & 1 deletion module/src/main/java/zipkin/module/storage/stackdriver/CredentialsDecoratingClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2016-2020 The OpenZipkin Authors
* Copyright 2016-2023 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 @@ -64,6 +64,7 @@ private CredentialsDecoratingClient(HttpClient delegate, Credentials credentials
headers.add(HttpHeaderNames.of(entry.getKey()), entry.getValue());
}
}));
ctx.updateRequest(newReq);
}
try {
responseFuture.complete(unwrap().execute(ctx, newReq));
Expand Down
9 changes: 5 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
<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.0</zipkin-reporter.version>
<zipkin-reporter.version>2.17.1</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.16.0</brave.version>
<brave.version>5.17.0</brave.version>

<!-- from armeria-grpc -->
<grpc.version>1.58.0</grpc.version>
Expand Down Expand Up @@ -298,9 +298,10 @@
<version>${maven-compiler-plugin.version}</version>
<inherited>true</inherited>
<configuration>
<source>1.8</source>
<target>1.8</target>
<source>${main.java.version}</source>
<target>${main.java.version}</target>
<fork>true</fork>
<release>8</release>
<showWarnings>true</showWarnings>
</configuration>
</plugin>
Expand Down