Skip to content

Commit b7a3acd

Browse files
tholenstcopybara-github
tholenst
authored and
copybara-github
committed
Remove MonitoringUtil.getMonitoringKeysetInfo. Inline all call sites (or use the existing KeysetHandle if we already obtained it).
PiperOrigin-RevId: 733670930 Change-Id: I6b02ea1da9a3f497fdfb50fa4985ec40e01fd280
1 parent ebb3100 commit b7a3acd

File tree

14 files changed

+21
-125
lines changed

14 files changed

+21
-125
lines changed

‎src/main/java/com/google/crypto/tink/aead/AeadWrapper.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,8 @@ public Aead wrap(final PrimitiveSet<Aead> pset) throws GeneralSecurityException
135135
MonitoringClient.Logger decLogger;
136136
if (!pset.getAnnotations().isEmpty()) {
137137
MonitoringClient client = MutableMonitoringRegistry.globalInstance().getMonitoringClient();
138-
KeysetHandleInterface keysetInfo = MonitoringUtil.getMonitoringKeysetInfo(pset);
139-
encLogger = client.createLogger(keysetInfo, pset.getAnnotations(), "aead", "encrypt");
140-
decLogger = client.createLogger(keysetInfo, pset.getAnnotations(), "aead", "decrypt");
138+
encLogger = client.createLogger(keysetHandle, pset.getAnnotations(), "aead", "encrypt");
139+
decLogger = client.createLogger(keysetHandle, pset.getAnnotations(), "aead", "decrypt");
141140
} else {
142141
encLogger = MonitoringUtil.DO_NOTHING_LOGGER;
143142
decLogger = MonitoringUtil.DO_NOTHING_LOGGER;

‎src/main/java/com/google/crypto/tink/daead/DeterministicAeadWrapper.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,8 @@ public DeterministicAead wrap(final PrimitiveSet<DeterministicAead> primitives)
140140
MonitoringClient.Logger decLogger;
141141
if (!primitives.getAnnotations().isEmpty()) {
142142
MonitoringClient client = MutableMonitoringRegistry.globalInstance().getMonitoringClient();
143-
KeysetHandleInterface keysetInfo = MonitoringUtil.getMonitoringKeysetInfo(primitives);
144-
encLogger = client.createLogger(keysetInfo, primitives.getAnnotations(), "daead", "encrypt");
145-
decLogger = client.createLogger(keysetInfo, primitives.getAnnotations(), "daead", "decrypt");
143+
encLogger = client.createLogger(handle, primitives.getAnnotations(), "daead", "encrypt");
144+
decLogger = client.createLogger(handle, primitives.getAnnotations(), "daead", "decrypt");
146145
} else {
147146
encLogger = MonitoringUtil.DO_NOTHING_LOGGER;
148147
decLogger = MonitoringUtil.DO_NOTHING_LOGGER;

‎src/main/java/com/google/crypto/tink/hybrid/HybridDecryptWrapper.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,9 @@ public HybridDecrypt wrap(final PrimitiveSet<HybridDecrypt> primitives)
116116
MonitoringClient.Logger decLogger;
117117
if (!primitives.getAnnotations().isEmpty()) {
118118
MonitoringClient client = MutableMonitoringRegistry.globalInstance().getMonitoringClient();
119-
KeysetHandleInterface keysetInfo = MonitoringUtil.getMonitoringKeysetInfo(primitives);
120119
decLogger =
121-
client.createLogger(keysetInfo, primitives.getAnnotations(), "hybrid_decrypt", "decrypt");
120+
client.createLogger(
121+
keysetHandle, primitives.getAnnotations(), "hybrid_decrypt", "decrypt");
122122
} else {
123123
decLogger = MonitoringUtil.DO_NOTHING_LOGGER;
124124
}

‎src/main/java/com/google/crypto/tink/hybrid/HybridEncryptWrapper.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,9 @@ public HybridEncrypt wrap(final PrimitiveSet<HybridEncrypt> primitives)
8989
MonitoringClient.Logger encLogger;
9090
if (!primitives.getAnnotations().isEmpty()) {
9191
MonitoringClient client = MutableMonitoringRegistry.globalInstance().getMonitoringClient();
92-
KeysetHandleInterface keysetInfo = MonitoringUtil.getMonitoringKeysetInfo(primitives);
9392
encLogger =
94-
client.createLogger(keysetInfo, primitives.getAnnotations(), "hybrid_encrypt", "encrypt");
93+
client.createLogger(
94+
keysetHandle, primitives.getAnnotations(), "hybrid_encrypt", "encrypt");
9595
} else {
9696
encLogger = MonitoringUtil.DO_NOTHING_LOGGER;
9797
}

‎src/main/java/com/google/crypto/tink/internal/MonitoringUtil.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,5 @@ public void logFailure() {}
3030

3131
public static final MonitoringClient.Logger DO_NOTHING_LOGGER = new DoNothingLogger();
3232

33-
public static <P> KeysetHandleInterface getMonitoringKeysetInfo(PrimitiveSet<P> primitiveSet) {
34-
return primitiveSet.getKeysetHandle();
35-
}
36-
3733
private MonitoringUtil() {}
3834
}

‎src/main/java/com/google/crypto/tink/jwt/JwtMacWrapper.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,11 +128,10 @@ public JwtMac wrap(final PrimitiveSet<JwtMac> primitives) throws GeneralSecurity
128128
MonitoringClient.Logger verifyLogger;
129129
if (!primitives.getAnnotations().isEmpty()) {
130130
MonitoringClient client = MutableMonitoringRegistry.globalInstance().getMonitoringClient();
131-
KeysetHandleInterface keysetInfo = MonitoringUtil.getMonitoringKeysetInfo(primitives);
132131
computeLogger =
133-
client.createLogger(keysetInfo, primitives.getAnnotations(), "jwtmac", "compute");
132+
client.createLogger(keysetHandle, primitives.getAnnotations(), "jwtmac", "compute");
134133
verifyLogger =
135-
client.createLogger(keysetInfo, primitives.getAnnotations(), "jwtmac", "verify");
134+
client.createLogger(keysetHandle, primitives.getAnnotations(), "jwtmac", "verify");
136135
} else {
137136
computeLogger = MonitoringUtil.DO_NOTHING_LOGGER;
138137
verifyLogger = MonitoringUtil.DO_NOTHING_LOGGER;

‎src/main/java/com/google/crypto/tink/jwt/JwtPublicKeySignWrapper.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,8 @@ public WrappedJwtPublicKeySign(final PrimitiveSet<JwtPublicKeySign> primitives)
5454
this.primaryKeyId = keysetHandle.getPrimary().getId();
5555
if (!primitives.getAnnotations().isEmpty()) {
5656
MonitoringClient client = MutableMonitoringRegistry.globalInstance().getMonitoringClient();
57-
KeysetHandleInterface keysetInfo = MonitoringUtil.getMonitoringKeysetInfo(primitives);
5857
this.logger =
59-
client.createLogger(keysetInfo, primitives.getAnnotations(), "jwtsign", "sign");
58+
client.createLogger(keysetHandle, primitives.getAnnotations(), "jwtsign", "sign");
6059
} else {
6160
this.logger = MonitoringUtil.DO_NOTHING_LOGGER;
6261
}

‎src/main/java/com/google/crypto/tink/jwt/JwtPublicKeyVerifyWrapper.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ public JwtPublicKeyVerify wrap(final PrimitiveSet<JwtPublicKeyVerify> primitives
9696
MonitoringClient.Logger logger;
9797
if (!primitives.getAnnotations().isEmpty()) {
9898
MonitoringClient client = MutableMonitoringRegistry.globalInstance().getMonitoringClient();
99-
KeysetHandleInterface keysetInfo = MonitoringUtil.getMonitoringKeysetInfo(primitives);
100-
logger = client.createLogger(keysetInfo, primitives.getAnnotations(), "jwtverify", "verify");
99+
logger =
100+
client.createLogger(keysetHandle, primitives.getAnnotations(), "jwtverify", "verify");
101101
} else {
102102
logger = MonitoringUtil.DO_NOTHING_LOGGER;
103103
}

‎src/main/java/com/google/crypto/tink/mac/MacWrapper.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,10 +133,10 @@ public Mac wrap(final PrimitiveSet<Mac> primitives) throws GeneralSecurityExcept
133133
MonitoringClient.Logger verifyLogger;
134134
if (!primitives.getAnnotations().isEmpty()) {
135135
MonitoringClient client = MutableMonitoringRegistry.globalInstance().getMonitoringClient();
136-
KeysetHandleInterface keysetInfo = MonitoringUtil.getMonitoringKeysetInfo(primitives);
137136
computeLogger =
138-
client.createLogger(keysetInfo, primitives.getAnnotations(), "mac", "compute");
139-
verifyLogger = client.createLogger(keysetInfo, primitives.getAnnotations(), "mac", "verify");
137+
client.createLogger(keysetHandle, primitives.getAnnotations(), "mac", "compute");
138+
verifyLogger =
139+
client.createLogger(keysetHandle, primitives.getAnnotations(), "mac", "verify");
140140
} else {
141141
computeLogger = MonitoringUtil.DO_NOTHING_LOGGER;
142142
verifyLogger = MonitoringUtil.DO_NOTHING_LOGGER;

‎src/main/java/com/google/crypto/tink/prf/PrfSetWrapper.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,17 +97,16 @@ public Map<Integer, Prf> getPrfs() throws GeneralSecurityException {
9797

9898
@Override
9999
public PrfSet wrap(PrimitiveSet<Prf> set) throws GeneralSecurityException {
100+
KeysetHandleInterface keysetHandle = set.getKeysetHandle();
100101
MonitoringClient.Logger logger;
101102
if (!set.getAnnotations().isEmpty()) {
102103
MonitoringClient client = MutableMonitoringRegistry.globalInstance().getMonitoringClient();
103-
KeysetHandleInterface keysetInfo = MonitoringUtil.getMonitoringKeysetInfo(set);
104-
logger = client.createLogger(keysetInfo, set.getAnnotations(), "prf", "compute");
104+
logger = client.createLogger(keysetHandle, set.getAnnotations(), "prf", "compute");
105105
} else {
106106
logger = MonitoringUtil.DO_NOTHING_LOGGER;
107107
}
108108

109109
Map<Integer, Prf> mutablePrfMap = new HashMap<>();
110-
KeysetHandleInterface keysetHandle = set.getKeysetHandle();
111110
for (int i = 0; i < keysetHandle.size(); i++) {
112111
KeysetHandleInterface.Entry entry = keysetHandle.getAt(i);
113112
if (entry.getKey() instanceof LegacyProtoKey) {

0 commit comments

Comments
 (0)