@netlify/plugin-nextjs 5.0.0-rc.5 → 5.0.0-rc.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -0
- package/dist/build/content/next-shims/telemetry-storage.cjs +55 -0
- package/dist/build/content/prerendered.js +3 -1
- package/dist/build/content/server.js +5 -1
- package/dist/build/content/static.js +3 -1
- package/dist/build/functions/server.js +4 -2
- package/dist/build/templates/handler-monorepo.tmpl.js +20 -14
- package/dist/build/templates/handler.tmpl.js +19 -14
- package/dist/esm-chunks/chunk-4635LKT6.js +244 -0
- package/dist/esm-chunks/{chunk-W7XTKMHH.js → chunk-757FQQND.js} +56 -44
- package/dist/esm-chunks/chunk-GV3YIJ33.js +110 -0
- package/dist/esm-chunks/{chunk-637Y3P2U.js → chunk-M2ZKGJAI.js} +1 -2
- package/dist/esm-chunks/chunk-PDPDW32D.js +89 -0
- package/dist/esm-chunks/{chunk-GQ6KIYPX.js → chunk-Y3K5Q6FP.js} +13 -12
- package/dist/esm-chunks/chunk-YSGPGDIG.js +278 -0
- package/dist/esm-chunks/{package-67C5TREY.js → package-NR7AMHPP.js} +3 -3
- package/dist/index.js +52 -32
- package/dist/run/handlers/cache.cjs +48 -842
- package/dist/run/handlers/request-context.cjs +4 -2
- package/dist/run/handlers/server.js +31 -35
- package/dist/run/handlers/tracer.cjs +927 -0
- package/dist/run/handlers/tracing.js +75 -78
- package/dist/run/headers.js +1 -1
- package/dist/run/next.cjs +6 -767
- package/package.json +1 -1
- package/dist/esm-chunks/chunk-CSTSA3JJ.js +0 -217
- package/dist/esm-chunks/chunk-VSH4JS2L.js +0 -125
- package/dist/esm-chunks/chunk-WFVNEURA.js +0 -94
|
@@ -815,785 +815,15 @@ var getDeployStore = (options = {}) => {
|
|
|
815
815
|
|
|
816
816
|
// src/run/handlers/cache.cts
|
|
817
817
|
var import_functions = __toESM(require_main());
|
|
818
|
-
|
|
819
|
-
// node_modules/@opentelemetry/api/build/esm/platform/node/globalThis.js
|
|
820
|
-
var _globalThis = typeof globalThis === "object" ? globalThis : global;
|
|
821
|
-
|
|
822
|
-
// node_modules/@opentelemetry/api/build/esm/version.js
|
|
823
|
-
var VERSION = "1.8.0";
|
|
824
|
-
|
|
825
|
-
// node_modules/@opentelemetry/api/build/esm/internal/semver.js
|
|
826
|
-
var re = /^(\d+)\.(\d+)\.(\d+)(-(.+))?$/;
|
|
827
|
-
function _makeCompatibilityCheck(ownVersion) {
|
|
828
|
-
var acceptedVersions = /* @__PURE__ */ new Set([ownVersion]);
|
|
829
|
-
var rejectedVersions = /* @__PURE__ */ new Set();
|
|
830
|
-
var myVersionMatch = ownVersion.match(re);
|
|
831
|
-
if (!myVersionMatch) {
|
|
832
|
-
return function() {
|
|
833
|
-
return false;
|
|
834
|
-
};
|
|
835
|
-
}
|
|
836
|
-
var ownVersionParsed = {
|
|
837
|
-
major: +myVersionMatch[1],
|
|
838
|
-
minor: +myVersionMatch[2],
|
|
839
|
-
patch: +myVersionMatch[3],
|
|
840
|
-
prerelease: myVersionMatch[4]
|
|
841
|
-
};
|
|
842
|
-
if (ownVersionParsed.prerelease != null) {
|
|
843
|
-
return function isExactmatch(globalVersion) {
|
|
844
|
-
return globalVersion === ownVersion;
|
|
845
|
-
};
|
|
846
|
-
}
|
|
847
|
-
function _reject(v) {
|
|
848
|
-
rejectedVersions.add(v);
|
|
849
|
-
return false;
|
|
850
|
-
}
|
|
851
|
-
function _accept(v) {
|
|
852
|
-
acceptedVersions.add(v);
|
|
853
|
-
return true;
|
|
854
|
-
}
|
|
855
|
-
return function isCompatible2(globalVersion) {
|
|
856
|
-
if (acceptedVersions.has(globalVersion)) {
|
|
857
|
-
return true;
|
|
858
|
-
}
|
|
859
|
-
if (rejectedVersions.has(globalVersion)) {
|
|
860
|
-
return false;
|
|
861
|
-
}
|
|
862
|
-
var globalVersionMatch = globalVersion.match(re);
|
|
863
|
-
if (!globalVersionMatch) {
|
|
864
|
-
return _reject(globalVersion);
|
|
865
|
-
}
|
|
866
|
-
var globalVersionParsed = {
|
|
867
|
-
major: +globalVersionMatch[1],
|
|
868
|
-
minor: +globalVersionMatch[2],
|
|
869
|
-
patch: +globalVersionMatch[3],
|
|
870
|
-
prerelease: globalVersionMatch[4]
|
|
871
|
-
};
|
|
872
|
-
if (globalVersionParsed.prerelease != null) {
|
|
873
|
-
return _reject(globalVersion);
|
|
874
|
-
}
|
|
875
|
-
if (ownVersionParsed.major !== globalVersionParsed.major) {
|
|
876
|
-
return _reject(globalVersion);
|
|
877
|
-
}
|
|
878
|
-
if (ownVersionParsed.major === 0) {
|
|
879
|
-
if (ownVersionParsed.minor === globalVersionParsed.minor && ownVersionParsed.patch <= globalVersionParsed.patch) {
|
|
880
|
-
return _accept(globalVersion);
|
|
881
|
-
}
|
|
882
|
-
return _reject(globalVersion);
|
|
883
|
-
}
|
|
884
|
-
if (ownVersionParsed.minor <= globalVersionParsed.minor) {
|
|
885
|
-
return _accept(globalVersion);
|
|
886
|
-
}
|
|
887
|
-
return _reject(globalVersion);
|
|
888
|
-
};
|
|
889
|
-
}
|
|
890
|
-
var isCompatible = _makeCompatibilityCheck(VERSION);
|
|
891
|
-
|
|
892
|
-
// node_modules/@opentelemetry/api/build/esm/internal/global-utils.js
|
|
893
|
-
var major = VERSION.split(".")[0];
|
|
894
|
-
var GLOBAL_OPENTELEMETRY_API_KEY = Symbol.for("opentelemetry.js.api." + major);
|
|
895
|
-
var _global = _globalThis;
|
|
896
|
-
function registerGlobal(type, instance, diag, allowOverride) {
|
|
897
|
-
var _a;
|
|
898
|
-
if (allowOverride === void 0) {
|
|
899
|
-
allowOverride = false;
|
|
900
|
-
}
|
|
901
|
-
var api = _global[GLOBAL_OPENTELEMETRY_API_KEY] = (_a = _global[GLOBAL_OPENTELEMETRY_API_KEY]) !== null && _a !== void 0 ? _a : {
|
|
902
|
-
version: VERSION
|
|
903
|
-
};
|
|
904
|
-
if (!allowOverride && api[type]) {
|
|
905
|
-
var err = new Error("@opentelemetry/api: Attempted duplicate registration of API: " + type);
|
|
906
|
-
diag.error(err.stack || err.message);
|
|
907
|
-
return false;
|
|
908
|
-
}
|
|
909
|
-
if (api.version !== VERSION) {
|
|
910
|
-
var err = new Error("@opentelemetry/api: Registration of version v" + api.version + " for " + type + " does not match previously registered API v" + VERSION);
|
|
911
|
-
diag.error(err.stack || err.message);
|
|
912
|
-
return false;
|
|
913
|
-
}
|
|
914
|
-
api[type] = instance;
|
|
915
|
-
diag.debug("@opentelemetry/api: Registered a global for " + type + " v" + VERSION + ".");
|
|
916
|
-
return true;
|
|
917
|
-
}
|
|
918
|
-
function getGlobal(type) {
|
|
919
|
-
var _a, _b;
|
|
920
|
-
var globalVersion = (_a = _global[GLOBAL_OPENTELEMETRY_API_KEY]) === null || _a === void 0 ? void 0 : _a.version;
|
|
921
|
-
if (!globalVersion || !isCompatible(globalVersion)) {
|
|
922
|
-
return;
|
|
923
|
-
}
|
|
924
|
-
return (_b = _global[GLOBAL_OPENTELEMETRY_API_KEY]) === null || _b === void 0 ? void 0 : _b[type];
|
|
925
|
-
}
|
|
926
|
-
function unregisterGlobal(type, diag) {
|
|
927
|
-
diag.debug("@opentelemetry/api: Unregistering a global for " + type + " v" + VERSION + ".");
|
|
928
|
-
var api = _global[GLOBAL_OPENTELEMETRY_API_KEY];
|
|
929
|
-
if (api) {
|
|
930
|
-
delete api[type];
|
|
931
|
-
}
|
|
932
|
-
}
|
|
933
|
-
|
|
934
|
-
// node_modules/@opentelemetry/api/build/esm/diag/ComponentLogger.js
|
|
935
|
-
var __read = function(o, n) {
|
|
936
|
-
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
937
|
-
if (!m)
|
|
938
|
-
return o;
|
|
939
|
-
var i = m.call(o), r, ar = [], e;
|
|
940
|
-
try {
|
|
941
|
-
while ((n === void 0 || n-- > 0) && !(r = i.next()).done)
|
|
942
|
-
ar.push(r.value);
|
|
943
|
-
} catch (error) {
|
|
944
|
-
e = { error };
|
|
945
|
-
} finally {
|
|
946
|
-
try {
|
|
947
|
-
if (r && !r.done && (m = i["return"]))
|
|
948
|
-
m.call(i);
|
|
949
|
-
} finally {
|
|
950
|
-
if (e)
|
|
951
|
-
throw e.error;
|
|
952
|
-
}
|
|
953
|
-
}
|
|
954
|
-
return ar;
|
|
955
|
-
};
|
|
956
|
-
var __spreadArray = function(to, from, pack) {
|
|
957
|
-
if (pack || arguments.length === 2)
|
|
958
|
-
for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
959
|
-
if (ar || !(i in from)) {
|
|
960
|
-
if (!ar)
|
|
961
|
-
ar = Array.prototype.slice.call(from, 0, i);
|
|
962
|
-
ar[i] = from[i];
|
|
963
|
-
}
|
|
964
|
-
}
|
|
965
|
-
return to.concat(ar || Array.prototype.slice.call(from));
|
|
966
|
-
};
|
|
967
|
-
var DiagComponentLogger = (
|
|
968
|
-
/** @class */
|
|
969
|
-
function() {
|
|
970
|
-
function DiagComponentLogger2(props) {
|
|
971
|
-
this._namespace = props.namespace || "DiagComponentLogger";
|
|
972
|
-
}
|
|
973
|
-
DiagComponentLogger2.prototype.debug = function() {
|
|
974
|
-
var args = [];
|
|
975
|
-
for (var _i = 0; _i < arguments.length; _i++) {
|
|
976
|
-
args[_i] = arguments[_i];
|
|
977
|
-
}
|
|
978
|
-
return logProxy("debug", this._namespace, args);
|
|
979
|
-
};
|
|
980
|
-
DiagComponentLogger2.prototype.error = function() {
|
|
981
|
-
var args = [];
|
|
982
|
-
for (var _i = 0; _i < arguments.length; _i++) {
|
|
983
|
-
args[_i] = arguments[_i];
|
|
984
|
-
}
|
|
985
|
-
return logProxy("error", this._namespace, args);
|
|
986
|
-
};
|
|
987
|
-
DiagComponentLogger2.prototype.info = function() {
|
|
988
|
-
var args = [];
|
|
989
|
-
for (var _i = 0; _i < arguments.length; _i++) {
|
|
990
|
-
args[_i] = arguments[_i];
|
|
991
|
-
}
|
|
992
|
-
return logProxy("info", this._namespace, args);
|
|
993
|
-
};
|
|
994
|
-
DiagComponentLogger2.prototype.warn = function() {
|
|
995
|
-
var args = [];
|
|
996
|
-
for (var _i = 0; _i < arguments.length; _i++) {
|
|
997
|
-
args[_i] = arguments[_i];
|
|
998
|
-
}
|
|
999
|
-
return logProxy("warn", this._namespace, args);
|
|
1000
|
-
};
|
|
1001
|
-
DiagComponentLogger2.prototype.verbose = function() {
|
|
1002
|
-
var args = [];
|
|
1003
|
-
for (var _i = 0; _i < arguments.length; _i++) {
|
|
1004
|
-
args[_i] = arguments[_i];
|
|
1005
|
-
}
|
|
1006
|
-
return logProxy("verbose", this._namespace, args);
|
|
1007
|
-
};
|
|
1008
|
-
return DiagComponentLogger2;
|
|
1009
|
-
}()
|
|
1010
|
-
);
|
|
1011
|
-
function logProxy(funcName, namespace, args) {
|
|
1012
|
-
var logger = getGlobal("diag");
|
|
1013
|
-
if (!logger) {
|
|
1014
|
-
return;
|
|
1015
|
-
}
|
|
1016
|
-
args.unshift(namespace);
|
|
1017
|
-
return logger[funcName].apply(logger, __spreadArray([], __read(args), false));
|
|
1018
|
-
}
|
|
1019
|
-
|
|
1020
|
-
// node_modules/@opentelemetry/api/build/esm/diag/types.js
|
|
1021
|
-
var DiagLogLevel;
|
|
1022
|
-
(function(DiagLogLevel2) {
|
|
1023
|
-
DiagLogLevel2[DiagLogLevel2["NONE"] = 0] = "NONE";
|
|
1024
|
-
DiagLogLevel2[DiagLogLevel2["ERROR"] = 30] = "ERROR";
|
|
1025
|
-
DiagLogLevel2[DiagLogLevel2["WARN"] = 50] = "WARN";
|
|
1026
|
-
DiagLogLevel2[DiagLogLevel2["INFO"] = 60] = "INFO";
|
|
1027
|
-
DiagLogLevel2[DiagLogLevel2["DEBUG"] = 70] = "DEBUG";
|
|
1028
|
-
DiagLogLevel2[DiagLogLevel2["VERBOSE"] = 80] = "VERBOSE";
|
|
1029
|
-
DiagLogLevel2[DiagLogLevel2["ALL"] = 9999] = "ALL";
|
|
1030
|
-
})(DiagLogLevel || (DiagLogLevel = {}));
|
|
1031
|
-
|
|
1032
|
-
// node_modules/@opentelemetry/api/build/esm/diag/internal/logLevelLogger.js
|
|
1033
|
-
function createLogLevelDiagLogger(maxLevel, logger) {
|
|
1034
|
-
if (maxLevel < DiagLogLevel.NONE) {
|
|
1035
|
-
maxLevel = DiagLogLevel.NONE;
|
|
1036
|
-
} else if (maxLevel > DiagLogLevel.ALL) {
|
|
1037
|
-
maxLevel = DiagLogLevel.ALL;
|
|
1038
|
-
}
|
|
1039
|
-
logger = logger || {};
|
|
1040
|
-
function _filterFunc(funcName, theLevel) {
|
|
1041
|
-
var theFunc = logger[funcName];
|
|
1042
|
-
if (typeof theFunc === "function" && maxLevel >= theLevel) {
|
|
1043
|
-
return theFunc.bind(logger);
|
|
1044
|
-
}
|
|
1045
|
-
return function() {
|
|
1046
|
-
};
|
|
1047
|
-
}
|
|
1048
|
-
return {
|
|
1049
|
-
error: _filterFunc("error", DiagLogLevel.ERROR),
|
|
1050
|
-
warn: _filterFunc("warn", DiagLogLevel.WARN),
|
|
1051
|
-
info: _filterFunc("info", DiagLogLevel.INFO),
|
|
1052
|
-
debug: _filterFunc("debug", DiagLogLevel.DEBUG),
|
|
1053
|
-
verbose: _filterFunc("verbose", DiagLogLevel.VERBOSE)
|
|
1054
|
-
};
|
|
1055
|
-
}
|
|
1056
|
-
|
|
1057
|
-
// node_modules/@opentelemetry/api/build/esm/api/diag.js
|
|
1058
|
-
var __read2 = function(o, n) {
|
|
1059
|
-
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
1060
|
-
if (!m)
|
|
1061
|
-
return o;
|
|
1062
|
-
var i = m.call(o), r, ar = [], e;
|
|
1063
|
-
try {
|
|
1064
|
-
while ((n === void 0 || n-- > 0) && !(r = i.next()).done)
|
|
1065
|
-
ar.push(r.value);
|
|
1066
|
-
} catch (error) {
|
|
1067
|
-
e = { error };
|
|
1068
|
-
} finally {
|
|
1069
|
-
try {
|
|
1070
|
-
if (r && !r.done && (m = i["return"]))
|
|
1071
|
-
m.call(i);
|
|
1072
|
-
} finally {
|
|
1073
|
-
if (e)
|
|
1074
|
-
throw e.error;
|
|
1075
|
-
}
|
|
1076
|
-
}
|
|
1077
|
-
return ar;
|
|
1078
|
-
};
|
|
1079
|
-
var __spreadArray2 = function(to, from, pack) {
|
|
1080
|
-
if (pack || arguments.length === 2)
|
|
1081
|
-
for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
1082
|
-
if (ar || !(i in from)) {
|
|
1083
|
-
if (!ar)
|
|
1084
|
-
ar = Array.prototype.slice.call(from, 0, i);
|
|
1085
|
-
ar[i] = from[i];
|
|
1086
|
-
}
|
|
1087
|
-
}
|
|
1088
|
-
return to.concat(ar || Array.prototype.slice.call(from));
|
|
1089
|
-
};
|
|
1090
|
-
var API_NAME = "diag";
|
|
1091
|
-
var DiagAPI = (
|
|
1092
|
-
/** @class */
|
|
1093
|
-
function() {
|
|
1094
|
-
function DiagAPI2() {
|
|
1095
|
-
function _logProxy(funcName) {
|
|
1096
|
-
return function() {
|
|
1097
|
-
var args = [];
|
|
1098
|
-
for (var _i = 0; _i < arguments.length; _i++) {
|
|
1099
|
-
args[_i] = arguments[_i];
|
|
1100
|
-
}
|
|
1101
|
-
var logger = getGlobal("diag");
|
|
1102
|
-
if (!logger)
|
|
1103
|
-
return;
|
|
1104
|
-
return logger[funcName].apply(logger, __spreadArray2([], __read2(args), false));
|
|
1105
|
-
};
|
|
1106
|
-
}
|
|
1107
|
-
var self = this;
|
|
1108
|
-
var setLogger = function(logger, optionsOrLogLevel) {
|
|
1109
|
-
var _a, _b, _c;
|
|
1110
|
-
if (optionsOrLogLevel === void 0) {
|
|
1111
|
-
optionsOrLogLevel = { logLevel: DiagLogLevel.INFO };
|
|
1112
|
-
}
|
|
1113
|
-
if (logger === self) {
|
|
1114
|
-
var err = new Error("Cannot use diag as the logger for itself. Please use a DiagLogger implementation like ConsoleDiagLogger or a custom implementation");
|
|
1115
|
-
self.error((_a = err.stack) !== null && _a !== void 0 ? _a : err.message);
|
|
1116
|
-
return false;
|
|
1117
|
-
}
|
|
1118
|
-
if (typeof optionsOrLogLevel === "number") {
|
|
1119
|
-
optionsOrLogLevel = {
|
|
1120
|
-
logLevel: optionsOrLogLevel
|
|
1121
|
-
};
|
|
1122
|
-
}
|
|
1123
|
-
var oldLogger = getGlobal("diag");
|
|
1124
|
-
var newLogger = createLogLevelDiagLogger((_b = optionsOrLogLevel.logLevel) !== null && _b !== void 0 ? _b : DiagLogLevel.INFO, logger);
|
|
1125
|
-
if (oldLogger && !optionsOrLogLevel.suppressOverrideMessage) {
|
|
1126
|
-
var stack = (_c = new Error().stack) !== null && _c !== void 0 ? _c : "<failed to generate stacktrace>";
|
|
1127
|
-
oldLogger.warn("Current logger will be overwritten from " + stack);
|
|
1128
|
-
newLogger.warn("Current logger will overwrite one already registered from " + stack);
|
|
1129
|
-
}
|
|
1130
|
-
return registerGlobal("diag", newLogger, self, true);
|
|
1131
|
-
};
|
|
1132
|
-
self.setLogger = setLogger;
|
|
1133
|
-
self.disable = function() {
|
|
1134
|
-
unregisterGlobal(API_NAME, self);
|
|
1135
|
-
};
|
|
1136
|
-
self.createComponentLogger = function(options) {
|
|
1137
|
-
return new DiagComponentLogger(options);
|
|
1138
|
-
};
|
|
1139
|
-
self.verbose = _logProxy("verbose");
|
|
1140
|
-
self.debug = _logProxy("debug");
|
|
1141
|
-
self.info = _logProxy("info");
|
|
1142
|
-
self.warn = _logProxy("warn");
|
|
1143
|
-
self.error = _logProxy("error");
|
|
1144
|
-
}
|
|
1145
|
-
DiagAPI2.instance = function() {
|
|
1146
|
-
if (!this._instance) {
|
|
1147
|
-
this._instance = new DiagAPI2();
|
|
1148
|
-
}
|
|
1149
|
-
return this._instance;
|
|
1150
|
-
};
|
|
1151
|
-
return DiagAPI2;
|
|
1152
|
-
}()
|
|
1153
|
-
);
|
|
1154
|
-
|
|
1155
|
-
// node_modules/@opentelemetry/api/build/esm/context/context.js
|
|
1156
|
-
function createContextKey(description) {
|
|
1157
|
-
return Symbol.for(description);
|
|
1158
|
-
}
|
|
1159
|
-
var BaseContext = (
|
|
1160
|
-
/** @class */
|
|
1161
|
-
/* @__PURE__ */ function() {
|
|
1162
|
-
function BaseContext2(parentContext) {
|
|
1163
|
-
var self = this;
|
|
1164
|
-
self._currentContext = parentContext ? new Map(parentContext) : /* @__PURE__ */ new Map();
|
|
1165
|
-
self.getValue = function(key) {
|
|
1166
|
-
return self._currentContext.get(key);
|
|
1167
|
-
};
|
|
1168
|
-
self.setValue = function(key, value) {
|
|
1169
|
-
var context = new BaseContext2(self._currentContext);
|
|
1170
|
-
context._currentContext.set(key, value);
|
|
1171
|
-
return context;
|
|
1172
|
-
};
|
|
1173
|
-
self.deleteValue = function(key) {
|
|
1174
|
-
var context = new BaseContext2(self._currentContext);
|
|
1175
|
-
context._currentContext.delete(key);
|
|
1176
|
-
return context;
|
|
1177
|
-
};
|
|
1178
|
-
}
|
|
1179
|
-
return BaseContext2;
|
|
1180
|
-
}()
|
|
1181
|
-
);
|
|
1182
|
-
var ROOT_CONTEXT = new BaseContext();
|
|
1183
|
-
|
|
1184
|
-
// node_modules/@opentelemetry/api/build/esm/context/NoopContextManager.js
|
|
1185
|
-
var __read3 = function(o, n) {
|
|
1186
|
-
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
1187
|
-
if (!m)
|
|
1188
|
-
return o;
|
|
1189
|
-
var i = m.call(o), r, ar = [], e;
|
|
1190
|
-
try {
|
|
1191
|
-
while ((n === void 0 || n-- > 0) && !(r = i.next()).done)
|
|
1192
|
-
ar.push(r.value);
|
|
1193
|
-
} catch (error) {
|
|
1194
|
-
e = { error };
|
|
1195
|
-
} finally {
|
|
1196
|
-
try {
|
|
1197
|
-
if (r && !r.done && (m = i["return"]))
|
|
1198
|
-
m.call(i);
|
|
1199
|
-
} finally {
|
|
1200
|
-
if (e)
|
|
1201
|
-
throw e.error;
|
|
1202
|
-
}
|
|
1203
|
-
}
|
|
1204
|
-
return ar;
|
|
1205
|
-
};
|
|
1206
|
-
var __spreadArray3 = function(to, from, pack) {
|
|
1207
|
-
if (pack || arguments.length === 2)
|
|
1208
|
-
for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
1209
|
-
if (ar || !(i in from)) {
|
|
1210
|
-
if (!ar)
|
|
1211
|
-
ar = Array.prototype.slice.call(from, 0, i);
|
|
1212
|
-
ar[i] = from[i];
|
|
1213
|
-
}
|
|
1214
|
-
}
|
|
1215
|
-
return to.concat(ar || Array.prototype.slice.call(from));
|
|
1216
|
-
};
|
|
1217
|
-
var NoopContextManager = (
|
|
1218
|
-
/** @class */
|
|
1219
|
-
function() {
|
|
1220
|
-
function NoopContextManager2() {
|
|
1221
|
-
}
|
|
1222
|
-
NoopContextManager2.prototype.active = function() {
|
|
1223
|
-
return ROOT_CONTEXT;
|
|
1224
|
-
};
|
|
1225
|
-
NoopContextManager2.prototype.with = function(_context, fn, thisArg) {
|
|
1226
|
-
var args = [];
|
|
1227
|
-
for (var _i = 3; _i < arguments.length; _i++) {
|
|
1228
|
-
args[_i - 3] = arguments[_i];
|
|
1229
|
-
}
|
|
1230
|
-
return fn.call.apply(fn, __spreadArray3([thisArg], __read3(args), false));
|
|
1231
|
-
};
|
|
1232
|
-
NoopContextManager2.prototype.bind = function(_context, target) {
|
|
1233
|
-
return target;
|
|
1234
|
-
};
|
|
1235
|
-
NoopContextManager2.prototype.enable = function() {
|
|
1236
|
-
return this;
|
|
1237
|
-
};
|
|
1238
|
-
NoopContextManager2.prototype.disable = function() {
|
|
1239
|
-
return this;
|
|
1240
|
-
};
|
|
1241
|
-
return NoopContextManager2;
|
|
1242
|
-
}()
|
|
1243
|
-
);
|
|
1244
|
-
|
|
1245
|
-
// node_modules/@opentelemetry/api/build/esm/api/context.js
|
|
1246
|
-
var __read4 = function(o, n) {
|
|
1247
|
-
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
1248
|
-
if (!m)
|
|
1249
|
-
return o;
|
|
1250
|
-
var i = m.call(o), r, ar = [], e;
|
|
1251
|
-
try {
|
|
1252
|
-
while ((n === void 0 || n-- > 0) && !(r = i.next()).done)
|
|
1253
|
-
ar.push(r.value);
|
|
1254
|
-
} catch (error) {
|
|
1255
|
-
e = { error };
|
|
1256
|
-
} finally {
|
|
1257
|
-
try {
|
|
1258
|
-
if (r && !r.done && (m = i["return"]))
|
|
1259
|
-
m.call(i);
|
|
1260
|
-
} finally {
|
|
1261
|
-
if (e)
|
|
1262
|
-
throw e.error;
|
|
1263
|
-
}
|
|
1264
|
-
}
|
|
1265
|
-
return ar;
|
|
1266
|
-
};
|
|
1267
|
-
var __spreadArray4 = function(to, from, pack) {
|
|
1268
|
-
if (pack || arguments.length === 2)
|
|
1269
|
-
for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
1270
|
-
if (ar || !(i in from)) {
|
|
1271
|
-
if (!ar)
|
|
1272
|
-
ar = Array.prototype.slice.call(from, 0, i);
|
|
1273
|
-
ar[i] = from[i];
|
|
1274
|
-
}
|
|
1275
|
-
}
|
|
1276
|
-
return to.concat(ar || Array.prototype.slice.call(from));
|
|
1277
|
-
};
|
|
1278
|
-
var API_NAME2 = "context";
|
|
1279
|
-
var NOOP_CONTEXT_MANAGER = new NoopContextManager();
|
|
1280
|
-
var ContextAPI = (
|
|
1281
|
-
/** @class */
|
|
1282
|
-
function() {
|
|
1283
|
-
function ContextAPI2() {
|
|
1284
|
-
}
|
|
1285
|
-
ContextAPI2.getInstance = function() {
|
|
1286
|
-
if (!this._instance) {
|
|
1287
|
-
this._instance = new ContextAPI2();
|
|
1288
|
-
}
|
|
1289
|
-
return this._instance;
|
|
1290
|
-
};
|
|
1291
|
-
ContextAPI2.prototype.setGlobalContextManager = function(contextManager) {
|
|
1292
|
-
return registerGlobal(API_NAME2, contextManager, DiagAPI.instance());
|
|
1293
|
-
};
|
|
1294
|
-
ContextAPI2.prototype.active = function() {
|
|
1295
|
-
return this._getContextManager().active();
|
|
1296
|
-
};
|
|
1297
|
-
ContextAPI2.prototype.with = function(context, fn, thisArg) {
|
|
1298
|
-
var _a;
|
|
1299
|
-
var args = [];
|
|
1300
|
-
for (var _i = 3; _i < arguments.length; _i++) {
|
|
1301
|
-
args[_i - 3] = arguments[_i];
|
|
1302
|
-
}
|
|
1303
|
-
return (_a = this._getContextManager()).with.apply(_a, __spreadArray4([context, fn, thisArg], __read4(args), false));
|
|
1304
|
-
};
|
|
1305
|
-
ContextAPI2.prototype.bind = function(context, target) {
|
|
1306
|
-
return this._getContextManager().bind(context, target);
|
|
1307
|
-
};
|
|
1308
|
-
ContextAPI2.prototype._getContextManager = function() {
|
|
1309
|
-
return getGlobal(API_NAME2) || NOOP_CONTEXT_MANAGER;
|
|
1310
|
-
};
|
|
1311
|
-
ContextAPI2.prototype.disable = function() {
|
|
1312
|
-
this._getContextManager().disable();
|
|
1313
|
-
unregisterGlobal(API_NAME2, DiagAPI.instance());
|
|
1314
|
-
};
|
|
1315
|
-
return ContextAPI2;
|
|
1316
|
-
}()
|
|
1317
|
-
);
|
|
1318
|
-
|
|
1319
|
-
// node_modules/@opentelemetry/api/build/esm/trace/trace_flags.js
|
|
1320
|
-
var TraceFlags;
|
|
1321
|
-
(function(TraceFlags2) {
|
|
1322
|
-
TraceFlags2[TraceFlags2["NONE"] = 0] = "NONE";
|
|
1323
|
-
TraceFlags2[TraceFlags2["SAMPLED"] = 1] = "SAMPLED";
|
|
1324
|
-
})(TraceFlags || (TraceFlags = {}));
|
|
1325
|
-
|
|
1326
|
-
// node_modules/@opentelemetry/api/build/esm/trace/invalid-span-constants.js
|
|
1327
|
-
var INVALID_SPANID = "0000000000000000";
|
|
1328
|
-
var INVALID_TRACEID = "00000000000000000000000000000000";
|
|
1329
|
-
var INVALID_SPAN_CONTEXT = {
|
|
1330
|
-
traceId: INVALID_TRACEID,
|
|
1331
|
-
spanId: INVALID_SPANID,
|
|
1332
|
-
traceFlags: TraceFlags.NONE
|
|
1333
|
-
};
|
|
1334
|
-
|
|
1335
|
-
// node_modules/@opentelemetry/api/build/esm/trace/NonRecordingSpan.js
|
|
1336
|
-
var NonRecordingSpan = (
|
|
1337
|
-
/** @class */
|
|
1338
|
-
function() {
|
|
1339
|
-
function NonRecordingSpan2(_spanContext) {
|
|
1340
|
-
if (_spanContext === void 0) {
|
|
1341
|
-
_spanContext = INVALID_SPAN_CONTEXT;
|
|
1342
|
-
}
|
|
1343
|
-
this._spanContext = _spanContext;
|
|
1344
|
-
}
|
|
1345
|
-
NonRecordingSpan2.prototype.spanContext = function() {
|
|
1346
|
-
return this._spanContext;
|
|
1347
|
-
};
|
|
1348
|
-
NonRecordingSpan2.prototype.setAttribute = function(_key, _value) {
|
|
1349
|
-
return this;
|
|
1350
|
-
};
|
|
1351
|
-
NonRecordingSpan2.prototype.setAttributes = function(_attributes) {
|
|
1352
|
-
return this;
|
|
1353
|
-
};
|
|
1354
|
-
NonRecordingSpan2.prototype.addEvent = function(_name, _attributes) {
|
|
1355
|
-
return this;
|
|
1356
|
-
};
|
|
1357
|
-
NonRecordingSpan2.prototype.setStatus = function(_status) {
|
|
1358
|
-
return this;
|
|
1359
|
-
};
|
|
1360
|
-
NonRecordingSpan2.prototype.updateName = function(_name) {
|
|
1361
|
-
return this;
|
|
1362
|
-
};
|
|
1363
|
-
NonRecordingSpan2.prototype.end = function(_endTime) {
|
|
1364
|
-
};
|
|
1365
|
-
NonRecordingSpan2.prototype.isRecording = function() {
|
|
1366
|
-
return false;
|
|
1367
|
-
};
|
|
1368
|
-
NonRecordingSpan2.prototype.recordException = function(_exception, _time) {
|
|
1369
|
-
};
|
|
1370
|
-
return NonRecordingSpan2;
|
|
1371
|
-
}()
|
|
1372
|
-
);
|
|
1373
|
-
|
|
1374
|
-
// node_modules/@opentelemetry/api/build/esm/trace/context-utils.js
|
|
1375
|
-
var SPAN_KEY = createContextKey("OpenTelemetry Context Key SPAN");
|
|
1376
|
-
function getSpan(context) {
|
|
1377
|
-
return context.getValue(SPAN_KEY) || void 0;
|
|
1378
|
-
}
|
|
1379
|
-
function getActiveSpan() {
|
|
1380
|
-
return getSpan(ContextAPI.getInstance().active());
|
|
1381
|
-
}
|
|
1382
|
-
function setSpan(context, span) {
|
|
1383
|
-
return context.setValue(SPAN_KEY, span);
|
|
1384
|
-
}
|
|
1385
|
-
function deleteSpan(context) {
|
|
1386
|
-
return context.deleteValue(SPAN_KEY);
|
|
1387
|
-
}
|
|
1388
|
-
function setSpanContext(context, spanContext) {
|
|
1389
|
-
return setSpan(context, new NonRecordingSpan(spanContext));
|
|
1390
|
-
}
|
|
1391
|
-
function getSpanContext(context) {
|
|
1392
|
-
var _a;
|
|
1393
|
-
return (_a = getSpan(context)) === null || _a === void 0 ? void 0 : _a.spanContext();
|
|
1394
|
-
}
|
|
1395
|
-
|
|
1396
|
-
// node_modules/@opentelemetry/api/build/esm/trace/spancontext-utils.js
|
|
1397
|
-
var VALID_TRACEID_REGEX = /^([0-9a-f]{32})$/i;
|
|
1398
|
-
var VALID_SPANID_REGEX = /^[0-9a-f]{16}$/i;
|
|
1399
|
-
function isValidTraceId(traceId) {
|
|
1400
|
-
return VALID_TRACEID_REGEX.test(traceId) && traceId !== INVALID_TRACEID;
|
|
1401
|
-
}
|
|
1402
|
-
function isValidSpanId(spanId) {
|
|
1403
|
-
return VALID_SPANID_REGEX.test(spanId) && spanId !== INVALID_SPANID;
|
|
1404
|
-
}
|
|
1405
|
-
function isSpanContextValid(spanContext) {
|
|
1406
|
-
return isValidTraceId(spanContext.traceId) && isValidSpanId(spanContext.spanId);
|
|
1407
|
-
}
|
|
1408
|
-
function wrapSpanContext(spanContext) {
|
|
1409
|
-
return new NonRecordingSpan(spanContext);
|
|
1410
|
-
}
|
|
1411
|
-
|
|
1412
|
-
// node_modules/@opentelemetry/api/build/esm/trace/NoopTracer.js
|
|
1413
|
-
var contextApi = ContextAPI.getInstance();
|
|
1414
|
-
var NoopTracer = (
|
|
1415
|
-
/** @class */
|
|
1416
|
-
function() {
|
|
1417
|
-
function NoopTracer2() {
|
|
1418
|
-
}
|
|
1419
|
-
NoopTracer2.prototype.startSpan = function(name, options, context) {
|
|
1420
|
-
if (context === void 0) {
|
|
1421
|
-
context = contextApi.active();
|
|
1422
|
-
}
|
|
1423
|
-
var root = Boolean(options === null || options === void 0 ? void 0 : options.root);
|
|
1424
|
-
if (root) {
|
|
1425
|
-
return new NonRecordingSpan();
|
|
1426
|
-
}
|
|
1427
|
-
var parentFromContext = context && getSpanContext(context);
|
|
1428
|
-
if (isSpanContext(parentFromContext) && isSpanContextValid(parentFromContext)) {
|
|
1429
|
-
return new NonRecordingSpan(parentFromContext);
|
|
1430
|
-
} else {
|
|
1431
|
-
return new NonRecordingSpan();
|
|
1432
|
-
}
|
|
1433
|
-
};
|
|
1434
|
-
NoopTracer2.prototype.startActiveSpan = function(name, arg2, arg3, arg4) {
|
|
1435
|
-
var opts;
|
|
1436
|
-
var ctx;
|
|
1437
|
-
var fn;
|
|
1438
|
-
if (arguments.length < 2) {
|
|
1439
|
-
return;
|
|
1440
|
-
} else if (arguments.length === 2) {
|
|
1441
|
-
fn = arg2;
|
|
1442
|
-
} else if (arguments.length === 3) {
|
|
1443
|
-
opts = arg2;
|
|
1444
|
-
fn = arg3;
|
|
1445
|
-
} else {
|
|
1446
|
-
opts = arg2;
|
|
1447
|
-
ctx = arg3;
|
|
1448
|
-
fn = arg4;
|
|
1449
|
-
}
|
|
1450
|
-
var parentContext = ctx !== null && ctx !== void 0 ? ctx : contextApi.active();
|
|
1451
|
-
var span = this.startSpan(name, opts, parentContext);
|
|
1452
|
-
var contextWithSpanSet = setSpan(parentContext, span);
|
|
1453
|
-
return contextApi.with(contextWithSpanSet, fn, void 0, span);
|
|
1454
|
-
};
|
|
1455
|
-
return NoopTracer2;
|
|
1456
|
-
}()
|
|
1457
|
-
);
|
|
1458
|
-
function isSpanContext(spanContext) {
|
|
1459
|
-
return typeof spanContext === "object" && typeof spanContext["spanId"] === "string" && typeof spanContext["traceId"] === "string" && typeof spanContext["traceFlags"] === "number";
|
|
1460
|
-
}
|
|
1461
|
-
|
|
1462
|
-
// node_modules/@opentelemetry/api/build/esm/trace/ProxyTracer.js
|
|
1463
|
-
var NOOP_TRACER = new NoopTracer();
|
|
1464
|
-
var ProxyTracer = (
|
|
1465
|
-
/** @class */
|
|
1466
|
-
function() {
|
|
1467
|
-
function ProxyTracer2(_provider, name, version, options) {
|
|
1468
|
-
this._provider = _provider;
|
|
1469
|
-
this.name = name;
|
|
1470
|
-
this.version = version;
|
|
1471
|
-
this.options = options;
|
|
1472
|
-
}
|
|
1473
|
-
ProxyTracer2.prototype.startSpan = function(name, options, context) {
|
|
1474
|
-
return this._getTracer().startSpan(name, options, context);
|
|
1475
|
-
};
|
|
1476
|
-
ProxyTracer2.prototype.startActiveSpan = function(_name, _options, _context, _fn) {
|
|
1477
|
-
var tracer = this._getTracer();
|
|
1478
|
-
return Reflect.apply(tracer.startActiveSpan, tracer, arguments);
|
|
1479
|
-
};
|
|
1480
|
-
ProxyTracer2.prototype._getTracer = function() {
|
|
1481
|
-
if (this._delegate) {
|
|
1482
|
-
return this._delegate;
|
|
1483
|
-
}
|
|
1484
|
-
var tracer = this._provider.getDelegateTracer(this.name, this.version, this.options);
|
|
1485
|
-
if (!tracer) {
|
|
1486
|
-
return NOOP_TRACER;
|
|
1487
|
-
}
|
|
1488
|
-
this._delegate = tracer;
|
|
1489
|
-
return this._delegate;
|
|
1490
|
-
};
|
|
1491
|
-
return ProxyTracer2;
|
|
1492
|
-
}()
|
|
1493
|
-
);
|
|
1494
|
-
|
|
1495
|
-
// node_modules/@opentelemetry/api/build/esm/trace/NoopTracerProvider.js
|
|
1496
|
-
var NoopTracerProvider = (
|
|
1497
|
-
/** @class */
|
|
1498
|
-
function() {
|
|
1499
|
-
function NoopTracerProvider2() {
|
|
1500
|
-
}
|
|
1501
|
-
NoopTracerProvider2.prototype.getTracer = function(_name, _version, _options) {
|
|
1502
|
-
return new NoopTracer();
|
|
1503
|
-
};
|
|
1504
|
-
return NoopTracerProvider2;
|
|
1505
|
-
}()
|
|
1506
|
-
);
|
|
1507
|
-
|
|
1508
|
-
// node_modules/@opentelemetry/api/build/esm/trace/ProxyTracerProvider.js
|
|
1509
|
-
var NOOP_TRACER_PROVIDER = new NoopTracerProvider();
|
|
1510
|
-
var ProxyTracerProvider = (
|
|
1511
|
-
/** @class */
|
|
1512
|
-
function() {
|
|
1513
|
-
function ProxyTracerProvider2() {
|
|
1514
|
-
}
|
|
1515
|
-
ProxyTracerProvider2.prototype.getTracer = function(name, version, options) {
|
|
1516
|
-
var _a;
|
|
1517
|
-
return (_a = this.getDelegateTracer(name, version, options)) !== null && _a !== void 0 ? _a : new ProxyTracer(this, name, version, options);
|
|
1518
|
-
};
|
|
1519
|
-
ProxyTracerProvider2.prototype.getDelegate = function() {
|
|
1520
|
-
var _a;
|
|
1521
|
-
return (_a = this._delegate) !== null && _a !== void 0 ? _a : NOOP_TRACER_PROVIDER;
|
|
1522
|
-
};
|
|
1523
|
-
ProxyTracerProvider2.prototype.setDelegate = function(delegate) {
|
|
1524
|
-
this._delegate = delegate;
|
|
1525
|
-
};
|
|
1526
|
-
ProxyTracerProvider2.prototype.getDelegateTracer = function(name, version, options) {
|
|
1527
|
-
var _a;
|
|
1528
|
-
return (_a = this._delegate) === null || _a === void 0 ? void 0 : _a.getTracer(name, version, options);
|
|
1529
|
-
};
|
|
1530
|
-
return ProxyTracerProvider2;
|
|
1531
|
-
}()
|
|
1532
|
-
);
|
|
1533
|
-
|
|
1534
|
-
// node_modules/@opentelemetry/api/build/esm/trace/status.js
|
|
1535
|
-
var SpanStatusCode;
|
|
1536
|
-
(function(SpanStatusCode2) {
|
|
1537
|
-
SpanStatusCode2[SpanStatusCode2["UNSET"] = 0] = "UNSET";
|
|
1538
|
-
SpanStatusCode2[SpanStatusCode2["OK"] = 1] = "OK";
|
|
1539
|
-
SpanStatusCode2[SpanStatusCode2["ERROR"] = 2] = "ERROR";
|
|
1540
|
-
})(SpanStatusCode || (SpanStatusCode = {}));
|
|
1541
|
-
|
|
1542
|
-
// node_modules/@opentelemetry/api/build/esm/api/trace.js
|
|
1543
|
-
var API_NAME3 = "trace";
|
|
1544
|
-
var TraceAPI = (
|
|
1545
|
-
/** @class */
|
|
1546
|
-
function() {
|
|
1547
|
-
function TraceAPI2() {
|
|
1548
|
-
this._proxyTracerProvider = new ProxyTracerProvider();
|
|
1549
|
-
this.wrapSpanContext = wrapSpanContext;
|
|
1550
|
-
this.isSpanContextValid = isSpanContextValid;
|
|
1551
|
-
this.deleteSpan = deleteSpan;
|
|
1552
|
-
this.getSpan = getSpan;
|
|
1553
|
-
this.getActiveSpan = getActiveSpan;
|
|
1554
|
-
this.getSpanContext = getSpanContext;
|
|
1555
|
-
this.setSpan = setSpan;
|
|
1556
|
-
this.setSpanContext = setSpanContext;
|
|
1557
|
-
}
|
|
1558
|
-
TraceAPI2.getInstance = function() {
|
|
1559
|
-
if (!this._instance) {
|
|
1560
|
-
this._instance = new TraceAPI2();
|
|
1561
|
-
}
|
|
1562
|
-
return this._instance;
|
|
1563
|
-
};
|
|
1564
|
-
TraceAPI2.prototype.setGlobalTracerProvider = function(provider) {
|
|
1565
|
-
var success = registerGlobal(API_NAME3, this._proxyTracerProvider, DiagAPI.instance());
|
|
1566
|
-
if (success) {
|
|
1567
|
-
this._proxyTracerProvider.setDelegate(provider);
|
|
1568
|
-
}
|
|
1569
|
-
return success;
|
|
1570
|
-
};
|
|
1571
|
-
TraceAPI2.prototype.getTracerProvider = function() {
|
|
1572
|
-
return getGlobal(API_NAME3) || this._proxyTracerProvider;
|
|
1573
|
-
};
|
|
1574
|
-
TraceAPI2.prototype.getTracer = function(name, version) {
|
|
1575
|
-
return this.getTracerProvider().getTracer(name, version);
|
|
1576
|
-
};
|
|
1577
|
-
TraceAPI2.prototype.disable = function() {
|
|
1578
|
-
unregisterGlobal(API_NAME3, DiagAPI.instance());
|
|
1579
|
-
this._proxyTracerProvider = new ProxyTracerProvider();
|
|
1580
|
-
};
|
|
1581
|
-
return TraceAPI2;
|
|
1582
|
-
}()
|
|
1583
|
-
);
|
|
1584
|
-
|
|
1585
|
-
// node_modules/@opentelemetry/api/build/esm/trace-api.js
|
|
1586
|
-
var trace = TraceAPI.getInstance();
|
|
1587
|
-
|
|
1588
|
-
// src/run/handlers/cache.cts
|
|
1589
818
|
var import_constants = require("next/dist/lib/constants.js");
|
|
1590
819
|
var import_request_context = require("./request-context.cjs");
|
|
820
|
+
var import_tracer = require("./tracer.cjs");
|
|
1591
821
|
var fetchBeforeNextPatchedIt = globalThis.fetch;
|
|
1592
822
|
var NetlifyCacheHandler = class {
|
|
1593
823
|
options;
|
|
1594
824
|
revalidatedTags;
|
|
1595
825
|
blobStore;
|
|
1596
|
-
tracer =
|
|
826
|
+
tracer = (0, import_tracer.getTracer)();
|
|
1597
827
|
tagManifestsFetchedFromBlobStoreInCurrentRequest;
|
|
1598
828
|
constructor(options) {
|
|
1599
829
|
this.options = options;
|
|
@@ -1639,67 +869,57 @@ var NetlifyCacheHandler = class {
|
|
|
1639
869
|
}
|
|
1640
870
|
}
|
|
1641
871
|
async get(...args) {
|
|
1642
|
-
return this.tracer.
|
|
1643
|
-
|
|
1644
|
-
|
|
1645
|
-
|
|
1646
|
-
|
|
1647
|
-
|
|
1648
|
-
|
|
872
|
+
return this.tracer.withActiveSpan("get cache key", async (span) => {
|
|
873
|
+
const [key, ctx = {}] = args;
|
|
874
|
+
console.debug(`[NetlifyCacheHandler.get]: ${key}`);
|
|
875
|
+
const blobKey = await this.encodeBlobKey(key);
|
|
876
|
+
span.setAttributes({ key, blobKey });
|
|
877
|
+
const blob = await this.tracer.withActiveSpan("blobStore.get", async (blobGetSpan) => {
|
|
878
|
+
blobGetSpan.setAttributes({ key, blobKey });
|
|
879
|
+
return await this.blobStore.get(blobKey, {
|
|
1649
880
|
type: "json"
|
|
1650
881
|
});
|
|
1651
|
-
|
|
1652
|
-
|
|
1653
|
-
|
|
1654
|
-
}
|
|
1655
|
-
const staleByTags = await this.checkCacheEntryStaleByTags(blob, ctx.tags, ctx.softTags);
|
|
1656
|
-
if (staleByTags) {
|
|
1657
|
-
span.addEvent("Stale", { staleByTags });
|
|
1658
|
-
return null;
|
|
1659
|
-
}
|
|
1660
|
-
this.captureResponseCacheLastModified(blob, key, span);
|
|
1661
|
-
switch (blob.value?.kind) {
|
|
1662
|
-
case "FETCH":
|
|
1663
|
-
span.addEvent("FETCH", { lastModified: blob.lastModified, revalidate: ctx.revalidate });
|
|
1664
|
-
return {
|
|
1665
|
-
lastModified: blob.lastModified,
|
|
1666
|
-
value: blob.value
|
|
1667
|
-
};
|
|
1668
|
-
case "ROUTE":
|
|
1669
|
-
span.addEvent("ROUTE", { lastModified: blob.lastModified, status: blob.value.status });
|
|
1670
|
-
return {
|
|
1671
|
-
lastModified: blob.lastModified,
|
|
1672
|
-
value: {
|
|
1673
|
-
...blob.value,
|
|
1674
|
-
body: import_node_buffer2.Buffer.from(blob.value.body, "base64")
|
|
1675
|
-
}
|
|
1676
|
-
};
|
|
1677
|
-
case "PAGE":
|
|
1678
|
-
span.addEvent("PAGE", { lastModified: blob.lastModified });
|
|
1679
|
-
return {
|
|
1680
|
-
lastModified: blob.lastModified,
|
|
1681
|
-
value: blob.value
|
|
1682
|
-
};
|
|
1683
|
-
default:
|
|
1684
|
-
span.recordException(new Error(`Unknown cache entry kind: ${blob.value?.kind}`));
|
|
1685
|
-
}
|
|
882
|
+
});
|
|
883
|
+
if (!blob) {
|
|
884
|
+
span.addEvent("Cache miss", { key, blobKey });
|
|
1686
885
|
return null;
|
|
1687
|
-
} catch (error) {
|
|
1688
|
-
if (error instanceof Error) {
|
|
1689
|
-
span.recordException(error);
|
|
1690
|
-
}
|
|
1691
|
-
span.setStatus({
|
|
1692
|
-
code: SpanStatusCode.ERROR,
|
|
1693
|
-
message: error instanceof Error ? error.message : String(error)
|
|
1694
|
-
});
|
|
1695
|
-
throw error;
|
|
1696
|
-
} finally {
|
|
1697
|
-
span.end();
|
|
1698
886
|
}
|
|
887
|
+
const staleByTags = await this.checkCacheEntryStaleByTags(blob, ctx.tags, ctx.softTags);
|
|
888
|
+
if (staleByTags) {
|
|
889
|
+
span.addEvent("Stale", { staleByTags });
|
|
890
|
+
return null;
|
|
891
|
+
}
|
|
892
|
+
this.captureResponseCacheLastModified(blob, key, span);
|
|
893
|
+
switch (blob.value?.kind) {
|
|
894
|
+
case "FETCH":
|
|
895
|
+
span.addEvent("FETCH", { lastModified: blob.lastModified, revalidate: ctx.revalidate });
|
|
896
|
+
return {
|
|
897
|
+
lastModified: blob.lastModified,
|
|
898
|
+
value: blob.value
|
|
899
|
+
};
|
|
900
|
+
case "ROUTE":
|
|
901
|
+
span.addEvent("ROUTE", { lastModified: blob.lastModified, status: blob.value.status });
|
|
902
|
+
return {
|
|
903
|
+
lastModified: blob.lastModified,
|
|
904
|
+
value: {
|
|
905
|
+
...blob.value,
|
|
906
|
+
body: import_node_buffer2.Buffer.from(blob.value.body, "base64")
|
|
907
|
+
}
|
|
908
|
+
};
|
|
909
|
+
case "PAGE":
|
|
910
|
+
span.addEvent("PAGE", { lastModified: blob.lastModified });
|
|
911
|
+
return {
|
|
912
|
+
lastModified: blob.lastModified,
|
|
913
|
+
value: blob.value
|
|
914
|
+
};
|
|
915
|
+
default:
|
|
916
|
+
span.recordException(new Error(`Unknown cache entry kind: ${blob.value?.kind}`));
|
|
917
|
+
}
|
|
918
|
+
return null;
|
|
1699
919
|
});
|
|
1700
920
|
}
|
|
1701
921
|
async set(...args) {
|
|
1702
|
-
return this.tracer.
|
|
922
|
+
return this.tracer.withActiveSpan("set cache key", async (span) => {
|
|
1703
923
|
const [key, data] = args;
|
|
1704
924
|
const blobKey = await this.encodeBlobKey(key);
|
|
1705
925
|
const lastModified = Date.now();
|
|
@@ -1722,7 +942,6 @@ var NetlifyCacheHandler = class {
|
|
|
1722
942
|
});
|
|
1723
943
|
}
|
|
1724
944
|
}
|
|
1725
|
-
span.end();
|
|
1726
945
|
});
|
|
1727
946
|
}
|
|
1728
947
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
@@ -1768,22 +987,9 @@ var NetlifyCacheHandler = class {
|
|
|
1768
987
|
let tagManifestPromise = this.tagManifestsFetchedFromBlobStoreInCurrentRequest[tag];
|
|
1769
988
|
if (!tagManifestPromise) {
|
|
1770
989
|
tagManifestPromise = this.encodeBlobKey(tag).then((blobKey) => {
|
|
1771
|
-
return this.tracer.
|
|
990
|
+
return this.tracer.withActiveSpan(`get tag manifest`, async (span) => {
|
|
1772
991
|
span.setAttributes({ tag, blobKey });
|
|
1773
|
-
|
|
1774
|
-
return await this.blobStore.get(blobKey, { type: "json" });
|
|
1775
|
-
} catch (error) {
|
|
1776
|
-
if (error instanceof Error) {
|
|
1777
|
-
span.recordException(error);
|
|
1778
|
-
}
|
|
1779
|
-
span.setStatus({
|
|
1780
|
-
code: SpanStatusCode.ERROR,
|
|
1781
|
-
message: error instanceof Error ? error.message : String(error)
|
|
1782
|
-
});
|
|
1783
|
-
throw error;
|
|
1784
|
-
} finally {
|
|
1785
|
-
span.end();
|
|
1786
|
-
}
|
|
992
|
+
return this.blobStore.get(blobKey, { type: "json" });
|
|
1787
993
|
});
|
|
1788
994
|
});
|
|
1789
995
|
this.tagManifestsFetchedFromBlobStoreInCurrentRequest[tag] = tagManifestPromise;
|