Skip to content

Commit

Permalink
Use shared GlobalOpenTelemetry instance.
Browse files Browse the repository at this point in the history
OpenTelemetry is enabled using the Java agent, so creating a separate SDK instane results in two instances.
  • Loading branch information
SanjayVas committed May 15, 2024
1 parent cdc0cf2 commit d1fa5dd
Show file tree
Hide file tree
Showing 11 changed files with 476 additions and 594 deletions.
4 changes: 2 additions & 2 deletions .github/actions/configure-metrics-aws/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@ runs:
- name: Install cert-manager
shell: bash
run: |
kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/v1.13.3/cert-manager.yaml
kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/v1.14.5/cert-manager.yaml
kubectl rollout status deployment cert-manager-webhook --namespace=cert-manager --timeout=5m
- name: Install OpenTelemetry operator
shell: bash
run: |
kubectl apply -f https://github.com/open-telemetry/opentelemetry-operator/releases/download/v0.88.0/opentelemetry-operator.yaml
kubectl apply -f https://github.com/open-telemetry/opentelemetry-operator/releases/download/v0.99.0/opentelemetry-operator.yaml
kubectl rollout status deployment opentelemetry-operator-controller-manager --namespace=opentelemetry-operator-system --timeout=5m
- name: Generate configurations
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/configure-metrics/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ runs:
- name: Install cert-manager
shell: bash
run: |
kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/v1.13.3/cert-manager.yaml
kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/v1.14.5/cert-manager.yaml
kubectl rollout status deployment cert-manager-webhook --namespace=cert-manager --timeout=5m
- name: Install OpenTelemetry operator
shell: bash
run: |
kubectl apply -f https://github.com/open-telemetry/opentelemetry-operator/releases/download/v0.88.0/opentelemetry-operator.yaml
kubectl apply -f https://github.com/open-telemetry/opentelemetry-operator/releases/download/v0.99.0/opentelemetry-operator.yaml
kubectl rollout status deployment opentelemetry-operator-controller-manager --namespace=opentelemetry-operator-system --timeout=5m
- name: Generate configurations
Expand Down
13 changes: 11 additions & 2 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module(
repo_name = "wfa_measurement_system",
)

OPENTELEMETRY_JAVA_VERSION = "1.32.0"
OPENTELEMETRY_JAVA_VERSION = "1.37.0"

PROJECTNESSIE_CEL_VERSION = "0.3.11"

Expand Down Expand Up @@ -126,7 +126,6 @@ bazel_dep(
)
bazel_dep(
name = "common-jvm",
version = "0.82.2",
repo_name = "wfa_common_jvm",
)
bazel_dep(
Expand Down Expand Up @@ -325,6 +324,16 @@ archive_override(
],
)

# DO_NOT_SUBMIT(world-federation-of-advertisers/common-jvm#251): Use version.
archive_override(
module_name = "common-jvm",
integrity = "sha256-qJJIjVmCOml8vd5S7YiCvzxaXcPvQcPf4HlRRPdtV0o=",
strip_prefix = "common-jvm-9f2c0f7361ce1948fe793f38c0bec48547483209",
urls = [
"https://github.com/world-federation-of-advertisers/common-jvm/archive/9f2c0f7361ce1948fe793f38c0bec48547483209.tar.gz",
],
)

# Force use of newer version of boringssl.
single_version_override(
module_name = "boringssl",
Expand Down
Loading

0 comments on commit d1fa5dd

Please sign in to comment.